3 ms·

What do you mean by "not git integration"?

by rantanplan 9y ago

dmitriid 9y ago
I personally find git integration in IDEA cumbersome and rather poorly designed. But I've seen my colleagues use it.
- timrichard 9y ago
  I have to disagree there.... I think Git integration in the Jetbrains IDEs are amazing. There's a general attitude the command line gives more power and flexibility than fancy graphical interfaces, and I'm with that 99% of the time. For me, Git integration is the exception. I've found in many shops that people memorise a few favourite Git riffs and then just try to make any VCS task fit those regardless. I find the Webstorm/IntelliJ Git integration to be very flexible... the Log view gives a lot of useful options to reason about the state of the various branches when there are several features in flight across the team simultaneously. Selective log view modes and the ability to group/visually reorder commits is useful too. I get a lot of use out of the Branch Compare tool (which is integrated with the diff merge tool), to show a snapshot of the differences between any two branches at any point of time, and to selectively merge across any small pieces of code interactively when a cherrypick of an entire commit would be too broad a brush. I expect there are ways of doing similar things in the CLI, but I find the Jetbrains IDE implementation gives a lot of clarity and confidence in what needs to be done and what's about to happen. Certainly more so than most dev shops I have experience of, where it's a small set menu of pull/commit/ push, merge, and optimism.
- mdaniel 9y ago
  Similar to the sibling's comment, be sure to look at the freshly released 2018.1 version: they finally included partial commits, and did so in a fantastic way https://blog.jetbrains.com/idea/2018/03/intellij-idea-2018-1-code-analysis-better-debugger-partial-git-commits-android-studio-3-0-and-other-improvements/ https://blog.jetbrains.com/idea/2018/03/intellij-idea-2018-1...

What do you mean by "not git integration"?

dmitriid 9y ago

I personally find git integration in IDEA cumbersome and rather poorly designed. But I've seen my colleagues use it.

timrichard 9y ago
I have to disagree there.... I think Git integration in the Jetbrains IDEs are amazing. There's a general attitude the command line gives more power and flexibility than fancy graphical interfaces, and I'm with that 99% of the time. For me, Git integration is the exception. I've found in many shops that people memorise a few favourite Git riffs and then just try to make any VCS task fit those regardless. I find the Webstorm/IntelliJ Git integration to be very flexible... the Log view gives a lot of useful options to reason about the state of the various branches when there are several features in flight across the team simultaneously. Selective log view modes and the ability to group/visually reorder commits is useful too. I get a lot of use out of the Branch Compare tool (which is integrated with the diff merge tool), to show a snapshot of the differences between any two branches at any point of time, and to selectively merge across any small pieces of code interactively when a cherrypick of an entire commit would be too broad a brush. I expect there are ways of doing similar things in the CLI, but I find the Jetbrains IDE implementation gives a lot of clarity and confidence in what needs to be done and what's about to happen. Certainly more so than most dev shops I have experience of, where it's a small set menu of pull/commit/ push, merge, and optimism.
mdaniel 9y ago
Similar to the sibling's comment, be sure to look at the freshly released 2018.1 version: they finally included partial commits, and did so in a fantastic way https://blog.jetbrains.com/idea/2018/03/intellij-idea-2018-1-code-analysis-better-debugger-partial-git-commits-android-studio-3-0-and-other-improvements/ https://blog.jetbrains.com/idea/2018/03/intellij-idea-2018-1...