Skip to content

Instantly share code, notes, and snippets.

@singularitti
Created November 30, 2022 02:32
Show Gist options
  • Save singularitti/66a59e49d1543c8ad4d3a21258006bfe to your computer and use it in GitHub Desktop.
Save singularitti/66a59e49d1543c8ad4d3a21258006bfe to your computer and use it in GitHub Desktop.
GitFlow: How to maintain previous releases? #Git
# See https://stackoverflow.com/a/69727920/3260253
git switch main # now you should be up to date with origin/main
git merge --strategy=ours hotfix/1.1.1 # bring in commits without their changes!
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment