Re: merge all non-conflicting

[Pedro Larroy <pedro larroy lists gmail com>]

Hi Piotr, thanks for your reply

It works now, but then clicking merge all non-conflicting doesn't make
sense anymore.

Also does it make sense to add buttons to go to the next conflict?


Pedro.

On Fri, May 4, 2012 at 2:16 PM, Piotr Piastucki <leech miranda gmail com> wrote:
> On Fri, May 4, 2012 at 1:46 PM, Pedro Larroy <pedro larroy lists gmail com>
> wrote:
>>
>> Hi Melders
>>
>> I'm wondering if I'm doing something wrong when using meld, as I'm
>> doing a 3-way merge merging $base $local and $other.
>>
>> When I say merge all non-conflicting I get changes in $local removed
>> because they are merged from $base, which is usually not what one
>> would want to do it when using 3-way merge to resolve scm conflicts.
>>
>>
>> Any ideas?
>>
>> Pedro.
>
>
> Hi,
>
> You can try to run meld in a conflict solver mode by passing 4 arguments:
> meld $mine $base $theirs $out
> Meld should try to merge the changes automatically leaving you only with
> conflicts to resolve manually.
>
> Cheers,
> Piotr