GNOME Bugzilla – Bug 699030
in conflict merge view, put LOCAL on left to match merge marker direction
Last modified: 2014-04-24 23:20:33 UTC
Meld's conflict merge view currently displays three panes in this order: REMOTE, MERGED, LOCAL With git at least, the MERGED pane contains conflict markers which look like this: <<<<<<< HEAD foo bar ======= baz >>>>>>> I think it's slightly confusing that the HEAD marker looks like an arrow pointing left, but the LOCAL pane which contains the HEAD revision is actually on the right. I think it would be nicer to display the panes in the order LOCAL, MERGED, REMOTE so the conflict markers would appear to point in the right direction.
Another benefit is that this would match the order in which these files are displayed when using git mergetool; it would be nice to be consistent with that.
Given that this has been this way forever in Meld, I really can't just change it without a revert option... while I'd love to, users will just have too much built-up habit there. I've added an option to the VC preferences pane that defines whether local is on the left or right. Default is right, because that's old Meld behaviour. I imagine that a gtk3 port will switch the default and/or remove the option entirely. Thanks for the bug report.
Awesome - thanks!
I've found that when this new option is "Left is local, right is remote" and I double click a modified file in version control view, Meld displays the new version of the file on the left and the old version on the right. That's unexpected and confusing, so it effectively makes this new option unusable for me. I originally filed this bug with only the conflict merge view in mind - perhaps this new option should affect only that. Reopening.
(In reply to comment #4) > I've found that when this new option is "Left is local, right is remote" and I > double click a modified file in version control view, Meld displays the new > version of the file on the left and the old version on the right. That's > unexpected and confusing, so it effectively makes this new option unusable for > me. Yup! In fact, I should probably change the options to "Left is local, right is remote" and "Left is old, right is new"... except that that's not always totally accurate. > I originally filed this bug with only the conflict merge view in mind - perhaps > this new option should affect only that. Reopening. In that case, we'd need a second option. The Left-is-local thing is an issue for other users independent of the merge view. I'll think on this.
There's now a new option in the version control preferences pane for order when merging. You can now have two-pane left-is-remote and three-pane local/merge/remote ordering together, which I think makes the most sense for Git users. (This does make rebase look weird, but then... rebase.) Thanks for the bug report.
Fantastic - thanks!