1

How to easily rebase branch with conflicts that are already fixed at the end of the rebase in git?

For example, I am on a feature branch and there are 2 commits in the master branch for the rebase.
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.
So how to rebase it as a whole instead of rebasing it 1 by 1 and solving the conflicts twice?

I think it must be answered somewhere, but I can't find anything, because all the similar questions titles are vague.

Julian
  • 33,915
  • 22
  • 119
  • 174
Lukas Salich
  • 959
  • 2
  • 12
  • 30
  • It was more complicated in the end and instead of rebase, I needed to use range based cherry-pick, which answer should I choose? – Lukas Salich Nov 01 '18 at 11:43
  • 1
    Well both answers are a bit the same. Same for the cherry-pick, first squash first. If that is all too difficult, you could choose for a merge (no squash needed then) ;) – Julian Nov 01 '18 at 12:48

2 Answers2

2

The best way is to squash the two commits first (by using the interactive rebase) and then rebase it on the master.

  1. squash the last 2 commits by interactive rebase:

    git rebase -i head~2

    choose squash (or fixup) for the 2nd commit

  2. and then rebase on master

    git rebase master
Julian
  • 33,915
  • 22
  • 119
  • 174
1

You should squash the commits in question before you rebase onto master. Do this with an interactive rebase onto the most recent common ancestor:

git rebase -i $(git merge-base master HEAD)

That way, the combined commit, when represented as a patch, can be applied to master cleanly:

git rebase master

The original first commit you are trying to apply to master will conflict, plain and simple. You must be able to check out that "state" once it is finished, so Git makes you resolve the conflict. Your fundamental question boils down to "how can I apply a patch that contains a conflict without creating a conflict," which you obviously cannot do. By squashing the commits first, you remove the need to apply the conflicted commit.

George Hilliard
  • 15,402
  • 9
  • 58
  • 96