title: EGit Conflict Resolution GUI?
body: <p>I think I am just merely (coming from an SVN background) confused with how Git conflicts are handled by EGit within Eclipse.</p>
  
  <p>I understand that it shows textually in the normal standard method by which to show conflicts as stated here: <a href="http://www.kernel.org/pub/software/scm/git/docs/git-merge.html#_how_conflicts_are_presented" rel="nofollow noreferrer">http://www.kernel.org/pub/software/scm/git/docs/git-merge.html#_how_conflicts_are_presented</a> however it isn't very clean and with thousands of lines of code it becomes unmanageable to avoid accidently deleting lines that are not meant to be deleted.</p>
  
  <p>Is there any GUI within EGit that can show me each conflict with an step over ability? </p>
  
  <p>I have searched around and I heard about the <code>merge tool</code> however when I follow the instructions by right clicking on the top level node of the tree (i.e. right click <code>models</code> folder that has the <code>&lt;&gt;</code> type icon denoting a conflict, which has a conflicted file of <code>User.php</code> within it) the merge tool is greyed out.</p>
  
  <p>Am I using the <code>merge tool</code> wrong?</p>
  
  <h2>Edit</h2>
  
  <p>I found out that a bug can cause EGit merge tool to not show: <a href="https://stackoverflow.com/questions/5934765/why-is-the-merge-tool-disabled-in-eclipse-for-a-egit-managed-project">Why is the merge tool disabled in Eclipse for a EGit-managed project?</a> however I am using EGit 1.3.0 so I should be way past this bug.</p>