git merge -Xours <branch_name>
'tools > git' 카테고리의 다른 글
How to remove untracked local files from git work tree (0) | 2018.04.25 |
---|---|
Remove big file history in git (0) | 2018.04.24 |
Git tracking file/direcotry 제거하기 (0) | 2018.03.19 |
Git branch, merge, checkout 명령어 모음 (0) | 2017.03.22 |
git commit시 vi 에러: there was a problem with the editor 'vi'. git (0) | 2017.03.18 |