Skip to main content

You are not logged in. Your edit will be placed in a queue until it is peer reviewed.

We welcome edits that make the post easier to understand and more valuable for readers. Because community members review edits, please try to make the post substantially better than how you found it, for example, by fixing grammar or adding additional resources and hyperlinks.

4
  • How is the 3 way merging for conflict resolution? Commented Feb 22, 2018 at 23:57
  • One of the best I've encountered. Perfectly covers all my needs. I'm not sure about other variants, but PHPStorm also does static analysis within the merge window (the middle column), so that you immediately see potential problems while merging. The latest EAP release also makes it possible to commit only selected lines of the code. Commented Mar 2, 2018 at 18:39
  • 1
    After more than two more years of active development, I can only re-emphasize how amazing JetBrains products are (all of them, basically). And if I absolutely needed an alternative GIT GUI, I would go with GitKraken. Commented Mar 2, 2018 at 18:44
  • 1
    I agree with @zaantar. The JetBrains products have the best and most intuitive git integration (imo), but his comment on selected lines of the code is only partially correct. They added the feature to select hunks for staging earlier this year, but selecting single lines (e.g. parts of a single hunk) is not possible (yet, but they might be working on that). Commented Jun 21, 2018 at 8:01