title: How to find conflicting parts of the code while / after executing git pull --rebase?
body: <p>After I did my changes to the code in the master branch I got a request (from another colleague) to merge my changes with those that have happened on the remote master branch.</p>
  
  <p>I more details I needed to run <code>git pull --rebase</code>. As a result of it I should expect some merge conflicts that I have to merge manually. My colleague told me that my changes and changes on remote master are in conflict.</p>
  
  <p>However, after I have executed <code>git pull --rebase</code>, I did not see any indication of a merge conflict. I got the following (cryptic to me) message:</p>
  
  <pre><code>Falling back to patching base and 3-way merge...
  Auto-merging dir1/dir2/dir3/my_script.py
  </code></pre>
  
  <p>So, my expectation was that it is the file where the merge conflicts should happen. However, when I open the file, I do not see any stuff that I usually see in case of a merge conflict (things like  <code>HEAD</code> or <code>&lt;&lt;&lt;&lt;&lt;&lt;</code> and so on).</p>
  
  <p>So, my question is: How to identify conflicting parts of two versions of code (from remote master and local master).</p>