Disable merge tool

Question

I recently installed eclipse indigo and egit V1.3 and configured my project in it. I cannot use Team-> Merge Tool according to the documentation in http://wiki.eclipse.org/EGit/User_Guide#Using_Merge_Tool in case of conflicts. The Merge option is disabled. A google search points me to https://bugs.eclipse.org/bugs/show_bug.cgi?id=339092 , but it looks like this error was resolved in the new version. Is there anything else I need to configure?

I am directly working on the main branch. Did I miss something?

Answer 1

The Synchronize View is also called Branch Comparison.
It performs comparisons (rather than merges as such). This allows you to see the differences (and detect potential conflict if you combine them), it does not trigger the merge.

If you click / merge / cherries, select the remote branch in your local branch, then the merge tool should be active.