k88hudson/git-flight-rules

Rebase from squashed merge

Open

#276 opened on Jul 31, 2019

View on GitHub
 (1 comment) (1 reaction) (0 assignees) (2,659 forks)batch import
great first issuehelp wanted

Repository metrics

Stars
 (35,618 stars)
PR merge metrics
 (Avg merge 1m) (1 merged PR 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

Research direction
Read the linked article and add a new flight rule about rebasing after a squash merge.
Tech stack
None
Domain
documentation
Issue type
Feature
DifficultyEstimated implementation difficulty for a new contributor, from 1 for very small changes to 5 for expert-level work.
1
Estimated timeA rough time range for an experienced contributor to investigate, implement, test, and prepare a pull request.
Under 1 hour
Activity statusHow available the issue appears right now: fresh, active, stale, blocked, or waiting on maintainer input.
Active
ClarityHow clearly the issue explains the expected change, acceptance criteria, and next step.
Clear
Prerequisites
Git
Newbie friendlinessA 1-100 score estimating how approachable this issue is for first-time contributors.
90