GNOME Bugzilla – Bug 698645
conflict merge tool should mark conflict as resolved
Last modified: 2014-04-22 01:10:59 UTC
After I use 'git mergetool' to resolve a conflict via Meld, the conflict is marked resolved. Meld subsequently displays the file in question as 'Modified', and 'git status' reports # All conflicts fixed but you are still merging. # (use "git commit" to conclude merge) # # Changes to be committed: # # modified: foo If I instead double click a conflicting file in Meld to open the 3-way conflict merge view directly, then after I make my edits and close the view Meld still shows the file with status 'Conflict', and 'git status' still reports # You have unmerged paths. # (fix conflicts and run "git commit") At that point I can right click the file in Meld and choose 'Add' which will mark the conflict as resolved, but that feels like a hack. I think Meld should automatically mark the conflict resolved in this situation if the user has made edits and saved changes in the conflict merge view.
I think there has been some discussion on the list about this - IMHO saving a file does not guarantee that you're happy that all conflicts have been resolved, although happy to be overruled here I guess.
I've fixed this in current master, though I'm open to further adjustments to the behaviour. We now prompt for whether to mark a conflict as resolved if we're launched from a VC that supports in, and the middle pane has been saved. I'm just not comfortable with the idea that saving implies resolution, so I think this is a fairly reasonable compromise. Having said that, feedback is welcome.
Sounds reasonable. Thanks for the fix!