examinedliving
2/21/2018 - 6:37 PM

Merging git branch into another

Merging git branch into another

# from fully committed {{new-branch}}
git checkout {{main-branch}}
git pull origin {{main-branch}}
git merge {{new-branch}}
git push origin {{main-branch}}