2

Let's say over past 8 hours, 2 PRs have merged to master. They are of medium size, not so huge, but not so small.

I'd like to incrementally rebase onto latest master. i.e., I'd like to rebase onto master as of the first PR merging, resolve conflicts, and then rebase onto latest master, as of the 2nd PR merging.

This makes merge conflicts very small.

If teams maintain a practice of creating good commit history through atomic commits, a developer could even incrementally rebase onto latest master on a per-commit basis. This makes conflicts as small as humanly possible, although you better be comfortable with rebasing, because there will be lots of tiny conflicts in comparison.

How can I perform multiple incremental rebases onto master, in the order that PRs were merged?

3
  • What's the question?
    – Tom W
    Commented May 19, 2023 at 15:42
  • Added question to bottom Commented May 19, 2023 at 16:37
  • Maybe to solve this we need to write some script that is rather involved? Commented May 19, 2023 at 16:38

0

Your Answer

By clicking “Post Your Answer”, you agree to our terms of service and acknowledge you have read our privacy policy.