rafaelmaeuer
10/1/2019 - 12:48 PM
How do I 'overwrite', rather than 'merge', a branch on another branch in Git?
git checkout branch_new
git merge -s ours branch_old
git checkout branch_old
git merge branch_newgit checkout branch_new
git merge -s ours branch_old
git checkout branch_old
git merge branch_new