Home

On Merging

I think this should be the proper way to merge a Pull Request without creating an unneeded "merge" commit. If the branch you want to merge is called wat:

git checkout dev
git pull
git checkout wat
git pull
git rebase dev
#previous steps may be unnecessary if those things are already effectively done, but this shouldn't harm things so w/e
git checkout dev
git merge wat #this should NOT create a new commit. If it does, then wat wasn't rebased
git push