You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
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.
The text was updated successfully, but these errors were encountered:
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.
The text was updated successfully, but these errors were encountered: