11 lines (11 loc) · 324 Bytes

Merge from CLI

git checkout master
git fetch
git merge --ff-only origin/master
git checkout BRANCH
git rebase master
If conflicts, resolve and git rebase --continue. Do not push.
git push origin/BRANCH -f
git checkout master
git merge --no-ff BRANCH
git push origin/master