error: Pulling is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.
무슨 문제일까요?
제목 | 날짜 | |
---|---|---|
본 게시판의 용도 | 2024/06/11 | |
4 | [git] git의 .gitignore 사용방법 문의 | 2021/12/27 |
3 | [git] git pull 했을 때 [1] | 2022/01/21 |
[git] git pull 했을 때 (2) [1] | 2022/01/30 | |
1 | [git] After changing branch in phpstorm, the directory is not visible | 2022/07/30 |
git add.
git pull