k88hudson / k88hudson/git-flight-rules
Rebase from squashed merge
- Dominant language
- No language data
- Stars
- 42.6k
- Forks
- 3.2k
- PR merge metrics
- No merged PRs in 30d
Description
Where I work, we've started a general policy to always squash merge our PRs. Sometimes I base new feature branches on unmerged PRs, and once those PRs are squash merged, it makes rebasing my feature branches back onto the master branch a bit more difficult.
Luckily I found this link which remedies the problem pretty well:
https://makandracards.com/makandra/45964-git-rebase-dependent-feature-branch-after-squash
I figured this would probably be a good candidate to add to the git flight rules. I just don't have time at the moment to make PR on this or I would have already. But I just wanted to put this up on the radar so maybe someone else or myself can add it at a later time.
Thanks!
Contributor guide
No contributing guide indexed for this repository
Research direction
Start by reading the linked Makandra card and the repository's existing flight rules to find the appropriate section for rebasing dependent branches after a squash merge. Done means the repository documents this workflow clearly and the guidance fits the surrounding flight rules.
Written by the indexing model from the issue text.
Assessment
- Tech stack
- git
- Domain
- documentation
- Issue type
- Documentation
- Difficulty
- 2/5
- Estimated time
- 1-3 hours
- Activity status
- Stale
- Clarity
- Mostly clear
- Newbie friendliness
- 48/100