jaymascarenas
4/1/2016 - 3:06 PM

To Scrap master and replace w/ your dev branch

To Scrap master and replace w/ your dev branch

git checkout better_branch
git merge --strategy=ours master    # keep the content of this branch, but record a merge
git checkout master
git merge better_branch             # fast-forward master up to the merge