Michael's blog OSS / Linux, networking and my private life

Merge file on a Mac

I recently had the need to merge the two files problem, ie the files have the same origin but both are edited in parallel.

To help them reunite opendiff on Mac, is the tool included in XCode .

To select the desired content of the new file, simply select the right under Actions in the desired merge mechanism.

I recently had the need to merge the two files problem, ie the files have the same origin but both are edited in parallel. To help them reunite opendiff on the Mac, the tool is included in XCode. To select the desired content of the new file, simply select the right under Actions in the desired merge mechanism.