Re: conflict resolution in Meld

[Adam Dingle <adam medovina org>]

On Tue, Apr 23, 2013 at 4:52 AM, Kai Willadsen <kai willadsen gmail com> wrote:

On 22 April 2013 22:55, Adam Dingle <adam medovina org> wrote:

2. Is the second view I described above (with the read-only files in /tmp) only partially implemented or broken? Could it not be just the same as the git mergetool view, which works pretty well already? Or am I missing something here?

Yeah... that was just an exciting bug. I've pushed a fix. I've only tested with Git, though if Mercurial was working then I'd be very interested to know why. The middle pane should be the output pane, and will go to the actual file being merged, with only the left and right read-only. Please check out the change I've made and see if you notice other issues with the merge view. As you said, it's a new feature.

I updated Meld and tried resolving a conflict - it works much better now.  Thanks!  I still noticed one issue which I filed here:

https://bugzilla.gnome.org/show_bug.cgi?id=698645

adam