title: A problem about git flow continously merge bugfix branch into dev branch
body: <p><a href="https://i.stack.imgur.com/VfoLl.png" rel="nofollow noreferrer">gitFlow image</a></p>
  <p>I'm confused about the continuously merge from <code>bugfix</code> branch to <code>dev</code> branch of <code>gitflow</code>. Think about this situation, if there are conflict when i merge commit <code>A</code> and <code>B</code> into <code>dev</code> branch, and i resolved it. Then i do several commits in <code>bugfix</code> branch, and now if i merge <code>bugfix</code> branch into <code>dev</code> branch, did i need to resolve the conflict caused by commit <code>A</code> and <code>B</code> again?</p>
  <p>I know git find the same ancestor commit to perform a 3-way compare, and if i guess right, the same ancestor commit will always be the yellow commit, so i need to resolve same conflict again and again when continuously merge <code>bugfix</code> into <code>dev</code>, this is unreasonable. I also verify my guess, but the results is inconsistent.</p>
  <p>Could anybody help me, thanks very much!</p>
  <p><strong>update</strong>: my test detail:
  <a href="https://i.stack.imgur.com/RWvqN.png" rel="nofollow noreferrer">log graph</a></p>
  <p>The test shows the git merge algorithm look likes can remember my resolve in commit <code>D</code> and auto resolve conflict sometimes. I know it may hard to explain about the test, but i would be grateful if anyone could tell me what did the git merge algorithm do.</p>