Jason Jason - 4 months ago 26
Git Question

How to replace master branch in git, entirely, from another branch?


Possible Duplicate:

Change the current branch to master in git




I have two branches in my git repo:


  1. master

  2. seotweaks (created originally from master)



I created
seotweaks
with the intention of quickly merging it back into
master
, however that was 3 months ago and the code in this branch is 13 versions ahead of
master
, it has effectively become our working master branch as all the code in
master
is more or less obsolete now.

Very bad practice I know, lesson learned.

Do you know how I can replace all of the contents of the
master
branch with those in
seotweaks
?

I could just delete everything in
master
and merge, but this does not feel like best practice.

Answer

You should be able to use the "ours" merge strategy to overwrite master with seotweaks like this:

git checkout seotweaks
git merge -s ours master
git checkout master
git merge seotweaks

The result should be your master is now essentially seotweaks.