Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[feature-request] incrementally rebase onto latest master #1048

Open
devinrhode2 opened this issue May 19, 2023 · 0 comments
Open

[feature-request] incrementally rebase onto latest master #1048

devinrhode2 opened this issue May 19, 2023 · 0 comments

Comments

@devinrhode2
Copy link

devinrhode2 commented May 19, 2023

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

1 participant