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
IntelliJ IDEA supports Git from the Windows Subsystem for Linux 2 (WSL2), which is available in Windows 10 version 2004. If Git is not installed on Windows, IntelliJ IDEA searches for Git in WSL and uses it from there.
From the main menu, choose VCS | Update Project or press Ctrl+T . The Update Project dialog opens. Select the update type (this strategy will be applied to all roots that are under Git version control): Merge the incoming changes into the current branch: select this option to perform merge during the update.
Press Ctrl+Alt+S to open the IDE settings and select Version Control | GitHub. Click Add account, and in the dialog that opens, click Sign up for Github. Register your account on the Sign up for GitHub page that opens. Return to the IntelliJ IDEA settings and specify your credentials.
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:\projects\PE-GIT\pe 13:31:02.437: git annotate -p -l -t -M HEAD -- src/jsp/workspaces/include/edit.jsp
Example:
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
Big Old Projects
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
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With