tools/git
Git: merge with specific branch
seul chan
2018. 6. 25. 20:00
git merge -Xours <branch_name>
git merge -Xours <branch_name>