시그마 삽질==six 시그마

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 출처:https://stackoverflow.com/questions/2763006/make-the-current-git-branch-a-master-branch