Git (replace master with a branch)

git_replace_master_with_a_branch.txt

// sometimes accidently you switched to a branch and working on it
// and forgot to merge with master for a long long time
// now it would be really difficult to merge with master
// this will basically replace master with a branch
// say, you have a master and a branch named "branch1"

git checkout branch1
git merge -s ours master
git checkout master
git merge branch1