Merge Automation

[mircohering]

Hi there,

i am trying to run the merge from the commandline so that i only have to do a visual merge in the UI when a conflict is envitable. Is there an option in DiffMerge to do that?

I would like to just a return code of 0 if the merge is successful, and a different returncode when i need to look at the file.

It would be even cooler if i could also ignore matching conflicts like the below:

File 1 (Ancestor)
a
b
c

File 2 (change 1)
a
bb
c

File 3 (change 2)
a
bb
c

Now if you run a 3 way compare you get a conflict, but really you shouldnt care as the conflict with an exact match.

Anyway - here is me hoping someone solved my problem for me.

Thanks,
Mirco

[jeffhostetler]

We don't currently have a non-gui version of merge as you describe.
It would be nice to be able to do that though. I'll log a feature request
for this.

What you might do until then is have a little shell script that runs a
command line tool like GNU diff3 and checks the error code and then
if it reports a conflict then run DiffMerge.

jeff