Git: cannot do a partial commit during a merge (SourceTree)
<p>After updating the SourceTree to it's latest version I am fighting with this issue. Assume following scenario:</p>

<p>There are file <strong>A</strong>, <strong>B</strong> and <strong>C</strong> under the version control and there is just one branch. In my working copy, I make some changes to the file <strong>A</strong> so it turns into a <strong>A'</strong> as well as the file <strong>B</strong> to <strong>B'</strong>. Someone else in his working copy makes a change to the file <strong>C</strong> -> <strong>C'</strong>.</p>

<p>I stage and commit my changes to the file <strong>B only</strong>. So I have a new revision: <strong>A</strong>, <strong>B'</strong>, <strong>C</strong> and working copy <strong>A'</strong>, <strong>B'</strong>, <strong>C</strong>.</p>

<p>The other one commits his changes, so he makes a revision <strong>A</strong>, <strong>B</strong>, <strong>C'</strong> and pushes it to the origin.</p>

<p>And here it comes. When I perform the pull, I get some merge changes (the <strong>C'</strong>). And I want to commit a revision consisting of <strong>A</strong>, <strong>B'</strong>, <strong>C'</strong>. I do not want to do now anything with the modified file <strong>A</strong>. However, the GIT, SourceTree resp., fails with:</p>

<blockquote>
  <p>fatal: cannot do a partial commit during a merge.</p>
</blockquote>

<p>untill I stage or discard changes to the file <strong>A</strong>.</p>

<p>I am pretty sure the some previous version of SourceTree did not expose this behavior.</p>

<p><strong>Update 2017/05</strong></p>

<p>It appears in the most recent SourceTree version 2.0.20.1 this issue has been resolved. However, be sure you want to update to this version, because it contains lot of "bugs" (new features) I really dislike.</p>