Zulip Chat Archive

Stream: maths

Topic: collaboration question

Arthur Paulino (Oct 25 2021 at 20:47):

How to proceed if I want to continue the work of someone whose branch has become stale?

  1. Branch out, make commits and open a PR from my branch into master
  2. Branch out, make commits and open a PR from my branch into their branch and then open a PR into master
  3. Make commits on top of their branch (probably too unpolite)

Mario Carneiro (Oct 25 2021 at 20:50):

probably make commits on their branch, but coordinate with them

Eric Wieser (Oct 25 2021 at 20:53):

In the past, what I've done is push only the commits needed to resolve conflicts to the stale branch, and then cherry picked small pieces of the branch into small PRs; in that case though, the original author was uncontactable

Yaël Dillies (Oct 25 2021 at 21:03):

Which branch is it?

Last updated: Dec 20 2023 at 11:08 UTC