[BZ#756216] New git merging behavior (showing "BASE") triggered from dirdiff can be misleading about the state of partial merges
Submitted by Andrew Sutherland
Link to original bug (#756216)
Description
As initially mentioned in bug 756148, the new functionality described at https://mail.gnome.org/archives/meld-list/2015-October/msg00004.html can be confusing if the merge is partially performed and the results saved.
Specifically, in my case, I had resolved all of the conflict markers and saved the file to disk, but because the merge was not resolved by a "git add":
- dirdiff still presented the file as having conflicts
- when I reopened the file in meld from the dirdiff UI, the middle merge pane seemed to have been regenerated from scratch, ignoring the revised state I had already persisted to disk. (Making me think the save had failed.)