title: Git Merge Conflict: Add Changes to be committed when resolved?
body: <p>I frequently come across the following Merge Conflict issue and resolving it but I would like to ask if my solution is correct. Personally, I do not see any issues given that the functional tests are passing but it would be nice to have an insight on this one.</p>
  
  <p>So, let's say we have got two branches:</p>
  
  <ol>
  <li><code>develop</code></li>
  <li><code>feature</code></li>
  </ol>
  
  <p>I am changing the code in <code>feature</code> branch and then creating a PR to merge into <code>develop</code>. However, <code>Github</code>'s or <code>Bitbucket</code>'s diff tool suggests that we have got a Merge Conflict; pretty common situation in coding.</p>
  
  <p>I then take the following steps:</p>
  
  <ol>
  <li><p><code>git checkout develop</code> and <code>git pull origin develop</code></p></li>
  <li><p><code>git checkout feature</code> and then <code>git pull origin feature</code></p></li>
  <li><code>git merge develop</code>, so to update my current branch. These steps help me out to spot the files that the conflicts occur.</li>
  <li>Then I fix the conflicts manually and I see:</li>
  </ol>
  
  <p>`You have unmerged paths.
    (fix conflicts and run "git commit")</p>
  
  <p>Changes to be committed:    </p>
  
  <pre><code>modified:   app/BlablaFile.php
      modified:   app/Blabla2File.php
      renamed:    app/OldName.php -&gt; app/NewName.php
  </code></pre>
  
  <p>and then:</p>
  
  <pre><code>Unmerged paths:
    (use "git add &lt;file&gt;..." to mark resolution)
      both modified:   app/UnmergedFile.php
  </code></pre>
  
  <p>which is basically a list of the files that I edited to resolve the merge conflict.</p>
  
  <p>Question is should I only <code>git add app/UnmergedFile.php</code> and then <code>git commit -m "Updated app/UnmergedFile.php"</code>? Or I should <code>git add</code> also the files that are included in the <code>Changes to be committed:</code> section?</p>
  
  <p>I normally do the first one but it would be nice to have another thought.   </p>