Three way merge in egit.

CodeMix & Angular IDE

>

Getting Help

This topic has 1 reply, 2 voices, and was last updated 6 years, 6 months ago by support-swapna.

Viewing 2 posts - 1 through 2 (of 2 total)

Author

Posts
May 18, 2018 at 4:14 am #586689 Reply

sblantipodi
Participant

Is there a way to use a three way merge instead of a two way in egit?

Thanks

May 18, 2018 at 4:46 am #586696 Reply

support-swapna
Moderator

Davide,

Please refer to this link for instructions to use three way merge in EGit :
https://wiki.eclipse.org/EGit/New_and_Noteworthy/2.2#Ancestor_pane_in_compare_editors_.28three-way_mode.29

Hope this helps.

–Swapna
Genuitec Support
Author

Posts

Viewing 2 posts - 1 through 2 (of 2 total)