Skip to content

Instantly share code, notes, and snippets.

@andmax

andmax/git_master_pointing_another_branch

Last active September 28, 2020 12:34
Show Gist options
  • Save andmax/0f9aa6286e5e15cefa858bef9e09d055 to your computer and use it in GitHub Desktop.
Save andmax/0f9aa6286e5e15cefa858bef9e09d055 to your computer and use it in GitHub Desktop.
Download ZIP
Git master branch merge (pointing to) another branch
Raw
git_master_pointing_another_branch
1. The problem is to make changes in <another_branch> until satisfied
2. having several branches with different versions that maybe entitled
3. to be the master branch, and then selecting <another_branch>
4. to be the master branch:
git checkout <another_branch>
<make changes as needed>
git merge -s ours master
git checkout master
git merge <another_branch>
git push origin master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment