Eclipse merging for conflict resolution

Question

For someone that dosn't know eclipse very well what is the easiest way to enable conflict resolution? I didn't realize the eclipse plugin didn't support that and found the following Note in the support documentation.

"Because Eclipse does not come with a built-in merge tool, you must install an external merge tool. If you have an edit conflict and you have installed a merge tool, an option appears so that you can merge options in the merge tool."

Any recommended tools and steps would really be appriciated.

Answer 1

There are a lot of good external merge tools. I like DiffMerge from SourceGear which is a free tool: http://www.sourcegear.com/diffmerge/

Then in Eclipse open the Preferences dialog and select the Team/Team Foundation Server/Merge Tools tab. Add a new merge tool for "*" with the following command line:

"C:\Program Files (x86)\SourceGear\DiffMerge\DiffMerge.exe" /m "/r=%4" "/t1=%6" "/t2=%8" "/t3=%7" "%1" "%3" "%2"

Hope that helps,

--Nick

---

Nick Kirchem - MSFT

Answer 2

Actually after looking closer at the eclipse it appears that there is a default merge tool. If I compare local changes I can merge those local versions together. Is that not a default merge tool and can't that be used when resolving conflicts? Am I missing something?