title: How to fix conflicts in git?
body: <p>When I try to pull I have the following message:</p>
  
  <pre><code>Automatic merge failed; fix conflicts and then commit the result.
  </code></pre>
  
  <p>So, I try to fix conflict (as git suggest) for that I follow <a href="https://help.github.com/articles/resolving-a-merge-conflict-using-the-command-line/" rel="noreferrer">these</a> instructions.</p>
  
  <p>Among the first things that I need to do is to open the "problematic" file in a text editor and find lines like that</p>
  
  <pre><code>If you have questions, please
  &lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD
  open an issue
  =======
  ask your question in IRC.
  &gt;&gt;&gt;&gt;&gt;&gt;&gt; branch-a
  </code></pre>
  
  <p>The problem is that I do not see things like that in my file. In particular I searched for HEAD and it is not there.</p>