Can Merge Be Forced to Have Source Override All?

[tom.peters]

Howdy!

 

I have a branch I need to merge and I have well over a hundred conflicts. I do not want to click through all these to specify Keep Source. I tried changing the Merge Options on the bottom of the Merge From Branch page and then recalculating, but I still have all these conflicts.

 

I tried using cm with the mergetype=forced, but to no avail.

 

Is there a way to just tell Plastic "Source wins for all"?

 

Thanks,

Tom

[tom.peters]

I just went with cm merge mergetype=forced and hit 2 + enter over and over. Any tips for next time would be appreciated.

[mig]

Hi Tom,

 

Next time I'd suggest you try the --keepsource parameter for command cm merge:

    --keepsource        Accepts all changes from source contributor.
                        (This is only available for normal merge, but not for
                        ancestor, neither cherrypicking.)

 

I think it might be what you were looking for :-)

 

Regards,

Miguel

[tom.peters]

Thanks!