k88hudson/git-flight-rules

Rebase from squashed merge

Aberta

#276 aberto em 31 de jul. de 2019

 (1 comentário) (1 reação) (0 responsável) (2.659 forks)batch import
great first issuehelp wanted

Métricas do repositório

Stars
 (35.618 estrelas)
Métricas de merge de PR
 (Mesclagem média 1m) (1 fundiu PR em 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!

Guia do colaborador