title: Merge conflict resolve
body: <p>Before that i've had experience that i needed to merge my feature in two branches and everything was ok, but not so long ago i had a problems with that. Previously i checkout first branch and merged there my feature branch and after i checkout my second branch and merged there my feature. Everything was ok before, but when i've done it last time first branch was merged to second and it became a problem. So i try to understand was it my mistakes as i didn't checkout and merge correct branches or i just don't understand how merging works.</p>
  
  <p>For example i have 3 branches.</p>
  
  <pre><code>dev
  feature-1
  master
  </code></pre>
  
  <p>if i checkout dev and merge there feature-1 branch and after that i checkout master and merge there feature-1 branch, will full dev branch be moved to master as one branch (dev+feature-1) or only feature-1 branch will be merged in master? Hope you understand me.</p>