k88hudson/git-flight-rules

Rebase from squashed merge

开放

#276 创建于 2019年7月31日

 (1 条评论) (1 个反应) (0 位负责人) (2,659 个派生)batch import
great first issuehelp wanted

仓库指标

星标
 (35,618 个星标)
PR 合并指标
 (平均合并 1分钟) (30 天内合并 1 个 PR)

描述

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!

贡献者指南