MERGE METHOD: (keeps branch history accurate) git checkout b1 git merge origin/master git push origin b1 REBASE METHOD: (history will appear linear, will conflict if already pushed) git checkout b1 git rebase master