docs/2019-11-12_pr-interdependent.md

In 2DegreesInvesting/ds-incubator: Share best practices in coding

title: Interdependent pull requests author: Mauro Lepore date: '2019-11-12' slug: pr-interdependent categories: [] tags: - pr description: ''

2019-11-12: Interdependent pull requests

Situation

After the contributor submitted a first pull request (pr1), and before the maintainer merges it into the source repository, the contributor starts a second pull request (pr2) that depends on pr1.

The maintainer edits pr1 and accepts it (squash-merges it into the upstream/master). But pr2 now is a mess and the contributor must fix it before it can be merged.

pr_init("pr1")

New f()

pr_push()

pr_init("pr2")

New g()

pr_push()

pr_fetch() (Maintainer)

Edit pr1 (Maintainer)

pr_push() (Maintainer)

pr_sync()

Fix pr2 then pr_push()

Squash-merge pr2 (Maintainer)

pr_finish()

2DegreesInvesting/ds-incubator documentation built on Oct. 13, 2021, 10:09 a.m.