Git GUI on Windows: merging conflicts

Question

I am fluent with Git on the command line but for a specific project, I need to show others how to do things exclusively in the GUI environment. We are using Git for Windows (available at https://git-scm.com/download/win).

I created a file and added to the repository. Then had another user modify the file and push it. I also modified the file, then I fetched the repository from origin, and used "Merge > Local Merge" menu to show how Git GUI finds the conflicts.

Then I manually edited the text file and resolved the conflict by cherry-picking some of my changes and some of those by the other user. At this stage, if it was command line I would do git add. In the GUI you are supposed to do the same thing using the "Stage Changed" button, I presume, but when I press the button it doesn't actually stage the changed file.

I cannot find any online documentation for the GUI program that discusses merge conflict resolution. Can anyone please tell me what the next step would be in the GUI environment?

My better advice: use GitExtensions instead. Easier to use... — Philippe, Aug 03 '16 at 23:48
Good advice. I will look into it. I will still leave this open though, in case someone knows the answer for Git for Windows. — Merik, Aug 04 '16 at 19:15
And you can even use a good merge tool like p4merge that will easy a lot of merge ;-) — Philippe, Aug 04 '16 at 20:20

score 34 · Accepted Answer · answered Aug 04 '16 at 20:51

34

I found the answer. As annoying as it is, when you are doing anything other than conflict resolution, the Stage Changed button does what the git add command would do. But if you are resolving conflicts, you should not use that button (it actually doesn't work); instead you should use the following menu: Commit > Stage To Commit. The keyboard shortcut is CTRL+T.

In fact the Stage Changed button is equivalent to the menu option Commit > Stage Changed Files to Commit.

answered Aug 04 '16 at 20:51

Merik

2,767
6
25
41

8

What a terrible UX :-( – William Jul 02 '18 at 07:17
9

two years later and this solved the same problem for me. Thank you! – anti Nov 12 '18 at 13:52
5

... And yet another year-plus later, still relevant. Saved my day! – David K Jan 08 '20 at 17:12
3

Jumping on the band wagon a few months hence :) – castro May 20 '20 at 14:06
2

Thank you all! Glad to see that my "discovery" has changed other people's lives :) – Merik May 21 '20 at 20:36
1

Saved me after hours of fighting with git. Thank you! – anti Jul 27 '20 at 09:14
1

Four++ years later, still relevant ;) – paulsm4 Dec 22 '20 at 21:27
1

5 years later still solve my noob problem..ty brother! – Dobidoo Oct 29 '21 at 06:03
1

6.4 years later, just saved me today – Norman Bird Dec 29 '22 at 05:29

Git GUI on Windows: merging conflicts

1 Answers1

Linked