Skip to content

Instantly share code, notes, and snippets.

@NguyenTrungTin

NguyenTrungTin/Git - Replace master branch, entirely, from development branch.md

Last active May 15, 2018 06:29
Show Gist options
  • Save NguyenTrungTin/948201c7601ee939af2e4fbd8decc776 to your computer and use it in GitHub Desktop.
Save NguyenTrungTin/948201c7601ee939af2e4fbd8decc776 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
Git - Replace master branch, entirely, from development branch.md

Git - Replace master branch, entirely, from development branch

  1. You should be able to use the "ours" merge strategy to overwrite master with seotweaks like this:
git checkout development
git merge -s ours master
git checkout master
git merge development
  1. The result should be your master is now essentially seotweaks.

(-s ours is short for --strategy=ours)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment