title: How do I avoid a conflict during rebase when a later commit resolves the conflict?
body: <p>How to easily rebase branch with conflicts that are already fixed at the end of the rebase in git?</p>
  
  <p>For example, I am on a feature branch and there are 2 commits in the master branch for the rebase. <br>
  First commit makes a conflict, but if the rebase joined both of the commits together, there would not be a conflict after the second commit. <br>
  So how to rebase it as a whole instead of rebasing it 1 by 1 and solving the conflicts twice? </p>
  
  <p>I think it must be answered somewhere, but I can't find anything, because all the similar questions titles are vague. </p>