git 원격지 덮어쓰기 remote merge

agnusdei·2023년 9월 12일
0
$ git pull
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.

@DESKTOP-O015QKJ MINGW64 /c/workspace/namdorang (develop|MERGING)
git reset --hard origin/develop

0개의 댓글