[feature-request] incrementally rebase onto latest master
Nobody has claimed this yet.
- Dominant language
- Shell
- Stars
- 18.1k
- Forks
- 1.2k
- Avg merge
- 5d 17h
- Merged PRs (30d)
- 1
Description
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.
Contributor guide
First steps
- Read the whole issue, then the project's contributing guide.
- Comment on the issue to say you are picking it up — it saves two people doing the same work.
- Fork the repository and make your change on a branch.
- Open a pull request that references the issue number.
Research direction
No file, test, or entry point is named in the issue, so begin by locating the existing rebase-related commands in this Git utilities repository. Define the expected behavior around incrementally rebasing after each merged pull request, including how completion would be verified for the described multi-PR scenario.
Written by the indexing model from the issue text.
Assessment
- Tech stack
- git, shell
- Domain
- cli, tooling
- Issue type
- Feature
- Difficulty
- 5/5
- Estimated time
- Over a week
- Activity status
- Stale
- Clarity
- Needs clarification
- Newbie friendliness
- 25/100