title: Github resolving conflicts always merges base branch to my current branch
body: <p>I am working in my local branch in PHP Storm. After the task is done, I commit my branch and push to git.</p>
  <p>On Github page I create a Pull request DEV &lt;- my branch.  Dev is the base branch, to which I will merge my branch.</p>
  <p>This is ok till now. But in case there are conflicts in some files - according to this article <a href="https://docs.github.com/en/free-pro-team@latest/github/collaborating-with-issues-and-pull-requests/resolving-a-merge-conflict-on-github" rel="noreferrer">https://docs.github.com/en/free-pro-team@latest/github/collaborating-with-issues-and-pull-requests/resolving-a-merge-conflict-on-github</a></p>
  <p>In my case the same file was updated in other branch and merged to DEV before. Now in my branch is the same file with other changes.</p>
  <p>When I resolve the conflict (can be even one line), I Mark it as resolved and the commit merge.</p>
  <p>And now it happens, that the whole DEV base branch is merged to my own branch, and this is not good.</p>
  <p>Because I am merging my branch to DEV, not vice versa. How is it possible to avoid this?</p>
  <p>I tried to recreate the same branch, but the once the dev was merged here, it is always there. It is nonsense that this happens on each conflict - as the 8. point of above mentioned web says:</p>
  <p><em>Once you've resolved all your merge conflicts, click Commit merge. This merges the entire base branch into your head branch.</em></p>
  <p><a href="https://i.stack.imgur.com/IkUjQ.png" rel="noreferrer"><img src="https://i.stack.imgur.com/IkUjQ.png" alt="enter image description here" /></a></p>