Skip to content

Multi‐branch hotfix workflow

Jump to bottom
Kate Hudson edited this page Feb 5, 2026 · 2 revisions

This workflow is appropriate if there are more than one major branch active (e.g. a v1 branch with main being v2).

Say you need to land a fix that needs to be backported to the other major branch.

Steps

  1. make a PR against main
  2. merge to mainon github
  3. Fetch main locally and checkout a new branch issue3-backport
  4. git cherry-pick [commit]
  5. push issue3-backport and create a PR against base v1
  6. after review DO NOT MERGE USING THE UI. Instead you, need to fast forward merge v1 to issue3-backport and push it

This is because of an egregious issue on the Github side https://github.com/orgs/community/discussions/4618

We could have a Github action that does this for us though

Clone this wiki locally