etc
git conflict 발생할 경우
easy16
2019. 10. 14. 10:51
git pull로 땡겨오면 아래와 같이 충돌난 부분이 생성
[Before]
If you have questions, please
<<<<<<< HEAD open an issue
======= ask your question in IRC.
>>>>>>> branch-a
[after] 원하는 부분을 남긴 후,
If you have questions, please
아래와 같이 add & commit
#git add .
#git commit -m "Resolved"
출처 :
https://help.github.com/en/articles/resolving-a-merge-conflict-using-the-command-line