CONFLICT (content): Merge conflict in

1 개요

CONFLICT (content): Merge conflict in

Console

Copy

root@zetawiki:/var/www# git pull
remote: Counting objects: 27, done.
remote: Compressing objects: 100% (14/14), done.
remote: Total 14 (delta 11), reused 0 (delta 0)
Unpacking objects: 100% (14/14), done.
From zetagit:/opt/git/www
   5cdbdc8..0664997  master     -> origin/master
Auto-merging html/css/zeta.css.map
CONFLICT (content): Merge conflict in html/css/zeta.css.map
Auto-merging html/css/zeta.css
Automatic merge failed; fix conflicts and then commit the result.

2 조치

Bash

Copy

git rm html/css/zeta.css.map

3 같이 보기

• git pull
• git push
• git rm
• Automatic merge failed; fix conflicts and then commit the result.

4 참고

• https://help.github.com/articles/resolving-a-merge-conflict-using-the-command-line/