2019-11-12_pr-interdependent.Rmd

---
output: github_document
---

# 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")`

<img src="https://i.imgur.com/vViZK38.png" width = 750 />

## New `f()`

<img src="https://i.imgur.com/vdWYsNB.png" width = 750 />

## `pr_push()`

<img src="https://i.imgur.com/49c8ayi.png" width = 750 />

<img src="https://i.imgur.com/mwfQGjD.png" width = 750 />

## `pr_init("pr2")`

<img src="https://i.imgur.com/0qBnkt5.png" width = 750 />

## New `g()`

<img src="https://i.imgur.com/4V5k3fz.png" width = 750 />

## `pr_push()`

<img src="https://i.imgur.com/MP2yvyX.png" width = 750 />

<img src="https://i.imgur.com/y2Oh0bk.png" width = 750 />

## `pr_fetch()` (Maintainer)

<img src="https://i.imgur.com/oqXfvQC.png" width = 750 />

## Edit `pr1` (Maintainer)

<img src="https://i.imgur.com/gkiMWV4.png" width = 750 />

## `pr_push()` (Maintainer)

<img src="https://i.imgur.com/6iYglIS.png" width = 750 />

<img src="https://i.imgur.com/7WeMLDE.png" width = 700 />

## `pr_sync()`

<img src="https://i.imgur.com/Q3qlilr.png" width = 750 />

## Fix `pr2` then `pr_push()`

<img src="https://i.imgur.com/Z49R2th.png" width = 750 />

<img src="https://i.imgur.com/MtpentI.png" width = 750 />

## Squash-merge `pr2` (Maintainer)

<img src="https://i.imgur.com/NGoM90n.png" width = 750 />

## `pr_finish()`

<img src="https://i.imgur.com/BP17N3S.png" width = 750 />

<img src="https://i.imgur.com/TFsvsns.png" width = 750 />