Best Practices for using Git with Intellij Idea

Question

In a nutshell: what are best practices for using Intellij Idea (9) and Git?

Context

We recently upgraded to Intellij idea version 9 and have started to use Git for a new feature on existing project.

We largely use git command line to learn the tool better. But we thought we'd pick the hive-mind to find out what are best practices for git with idea.

The Idea UI is similar for both CVS and Git, yet the underlying implementations differ a bit.

Example Questions

For example: -With CVS, when we had multiple release of a product, each of us would have a local copy of the 1-0, 2-0, 3-0, etc. branches , each with its own Intellij files (i.e. .ipr, .iws, etc.). The "git way" seems to have one project and use 'git branch' to switch branches. This is fine, but it creates huge overhead for idea (as it has to reload each changed file, including checked-in jars) when you change branches. So: do you still have a separate project (with .git) for each "major release" or have one project and use "git branch"?

-Is it a good idea to use Autostash?

-Do you automatically add each modification to your git commit? or use "git add" later?

-Do you rebase?

-Best way to merge?

-Any other hints/tips/what-works-for-you,etc.

Final Comments

We still "think in cvs" so part of this is getting used to git; part is getting used to Idea's Ui for git.

These are fairly rudimentary questions as we still use the comand line primarily. Also I've heard idea 10 has better/stronger/faster git integration tools

Thanks

question from:https://stackoverflow.com/questions/3873872/best-practices-for-using-git-with-intellij-idea

Answer 1

Here's what we've found after several weeks of Git/Idea. I've made this a community wiki. Please throw in your 2 kronor/centimos/pfennings/cents.

Note: I'm answering my own question because I sought those easy-use bullet points.

Presupposition

Idea is great tool. No one here is complaining. Just observing.

Best Practices

• At this point (9.0.3) Git with Idea is just plain harder to use than SVN with Idea. Part stems from the complexity of Git (vs SVN), partly because Idea's tools don't do everything in the git world.

• Thus you will need to use the command line

• Idea's merge tool works much better than command line merging or even using mergetool (using meld or mergetool). The reason: you have much more freedeom to work in the 'idea environment' rather than fixe one lint at a time.

• Remember to synchronize in Idea (ctrl-alt-y) when you update the working tree from the command line

• Watching the Git Console to learn idea's git tricks; idea executes git commands there.( Version Control view, Console tab):

example:

13:30:58.234: git log -M --follow --name-only --pretty=format:%H%x00%ct%x00%an%x20%x3C%ae%x3E%x00%cn%x20%x3C%ce%x3E%x00%s%n%n%b%x00 --encoding=UTF-8 -- src/jsp/workspaces/include/edit.jsp
13:31:02.437: cd J:projectsPE-GITpe
13:31:02.437: git annotate -p -l -t -M HEAD -- src/jsp/workspaces/include/edit.jsp

• Unfortunately Idea does not have good tools for "merging conflicts in upstream commits" in 9.0.3

Example:

• Alice does work, commits (locally) file A, commits file B, commits file C
• Bob does work, commits file C, commits file D, commits file E
• Alice pushes her changes
• Bob Pulls his changes

Coming from CVS/SVN, I expected Ideas handy diffing tool to pop up. No. Instead git/idea throw up a red flag, I usually end up using "git mergetool" (meld od on linux, tortoiesmerge on windows).

Note: Perhaps Idea provides a better way. Please set me straight. Note to the motivated: can you set up .gitconfig to use Idea's diffing tool?

Stashing

• Ideas "Shelve" functionality duplicates "Git Stash". Both seem similar. Both use patches. You probably want to use one or the other. I haven't figured out the advantage of one or the other

Big Old Projects

• If you're working on a decade old project recently migrated to Git, with jar files checked into the scm (i.e. previously checked into CVS/SVN, where log4j-1.0.jar is in BRANCH-2-0 and the mainline has log4j-9.0.jar ), PROCEED WITH CAUTION if you want to checkout "version 2.0" of your project. Idea needs to unload all the "head" jars and reload the jars-checked-in-at-2.0. This takes for-ever.

Other little stuff

• The idea menus/UI still shows "git init..." even though you've already initialized Git. It's confusing, but ignore it.

• You cannot have the same working tree in both Git and CVS/SVN (though the UI may seem to imply so). I/we tried this during an initial "let's try git and still use CVS as a backup plan" phase. It didn't work