Re: Replacement for "merge non-conflicting"?

[Mitchel Humpherys <mitch special gmail com>]

On Tue, Sep 30 2014 at 12:40:02 PM, Mitchel Humpherys <mitch special gmail com> wrote:
> On Thu, Sep 18 2014 at 01:32:25 PM, Kai Willadsen <kai willadsen gmail com> wrote:
> > On 16 September 2014 07:26, Mitchel Humpherys <mitch special gmail com> wrote:
> > > Looks like a recent update removed the "Merge non-conflicting" item from
> > > meld's "Changed" menu.  I thought "Merge All" would be the equivalent
> > > option but it always seems to result in not doing "the right thing" like
> > > "merge non-conflicting" did.  Is there a replacement workflow for "Merge
> > > non-conflicting" followed by manually resolving the remaining conflicts?
> >
> > "Merge All" is just a rename of the menu item. It does exactly the
> > same action that "Merge non-conflicting" used to do, so if anything
> > has broken then either it was already like that, or the merging code
> > has changed. I don't *think* the merging code has changed much
> > recently, but I'd have to double check.
>
> Hmm, all I know is that I get a bunch of stuff merged to the "middle"
> buffer from what I would deem the "wrong side"...  In prior versions of
> meld it always seemed to do exactly what I expected and wanted it to do.
> I'm not sure when this changed but this is what I'm seeing with meld
> 3.12.0.

Some other evidence that the merge code has changed within the past few
months (at least on my distro (Arch Linux)) is that it now leaves git's
merge markers in the output buffer, which I don't remember it ever doing
before.  I'm fine with that change, btw, but there seem to be some other
side-effects with recent merge code changes...


-- 
Mitch