Skip to content

Instantly share code, notes, and snippets.

@tylerbutler

tylerbutler/integration-plan.md

Last active May 27, 2022 18:25
Show Gist options
  • Save tylerbutler/9fae98c16e28d7985e0727a70ba67b0b to your computer and use it in GitHub Desktop.
Save tylerbutler/9fae98c16e28d7985e0727a70ba67b0b to your computer and use it in GitHub Desktop.
Download ZIP
Raw
integration-plan.md

Configure the branches

  • integrate/base -- the most recent commit that was cherry-picked into next
  • integrate/tip -- the main branch commit that should be merged into the next branch "next" (haha)
  • integrate/working -- the "virtual main branch" or "working copy of next branch". This serves as the merge base for integrate/tip to be merged in
git checkout -b integrate/base 06d7e6bb3adcde8a1aafb6958e5eced8b62c30c4
git checkout -b integrate/tip e5182598a48df7d0f40ce79ba057af850d90022c
git checkout next

Merge next to main

The integrate/working branch should start at integrate/base. Then merge next into integrate/working, preferring the next changes in the case of conflict.

git checkout -b integrate/working integrate/base
git merge next -s ort -Xtheirs

Testing and fixup

TODO

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment