GNOME Bugzilla – Bug 685889
support diff3 format files
Last modified: 2017-12-13 19:01:20 UTC
sometimes it's already too late to use meld, and you end up with conflict markers in your file(s), like >>>> HEAD and <<< REV x. For these cases, it would be nice if meld detected the diff3 format markers and automatically show me the common ancestor, local and remote version in a 3-way-merge-view instead of everything in one file. I'd highly appreciate such a feature, as I think meld is currently the best merge tool available (the interface is way better than kdiff3's, much more like the Eclipse merge view which I find excellent) and often use it with git.
Yeah, this would be excellent, and would give us a better git mergetool for conflict resolution. However, I think we really do actually need the diff3 format with the === markers for the ancestor file; I think the left and right sides don't tell us much that we don't already know.
Requiring the diff3 format shouldn't be a problem because git can provide them. You can enable them with this command: git config --global merge.conflictstyle diff3
Yes, it should be doable, but it requires recognising and handling the diff3 format. Also, it shouldn't require the user to have set up the conflict style ahead of time; we should be able to re-trigger a merge with diff3 style conflicts. For clarity, was the original request about reconstructing the local and remote sides from the diff3, or just about inserting the ancestor instead of the conflict?
I thought meld already supported diff3 per se, just not in that case... I hope and suppose there's a lib for that:) As for the git merge-option, it is not forced upon the user, I just want meld to be able to handle such files when it encounters diff3 markers. If the user has not set up the mergestyle to diff3, the merge experience will suffer, that's all. The gist of this RFE was to reconstruct the local, remote and common ancestor from the diff3, as it's all in there. This way I'd have the same, nice 3-way-merge-view as in the normal situation, when directly using git mergetool [meld] and the individual files provided by git.
-- GitLab Migration Automatic Message -- This bug has been migrated to GNOME's GitLab instance and has been closed from further activity. You can subscribe and participate further through the new bug through this link to our GitLab instance: https://gitlab.gnome.org/GNOME/meld/issues/47.