다음과 같은 에러 메시지 발생하고 pull 실패
바로 직전 pull 시 머지를 시도했지만 conflict 가 발생하여 충돌 상태일 경우 발생함.
머지를 취소하고 다시 pull 을 받음
git merge --abort
충돌 해결 후 다시 pull 받음
- 변경 내역을 커밋하고 다시 pull
특별한 리비전 의미
HEADnames the commit on which you based the changes in the working tree.
FETCH_HEADrecords the branch which you fetched from a remote repository with your last git fetch invocation.
ORIG_HEADis created by commands that move your
HEADin a drastic way, to record the position of the
HEADbefore their operation, so that you can easily change the tip of the branch back to the state before you ran them.
MERGE_HEADrecords the commit(s) which you are merging into your branch when you run git merge.
CHERRY_PICK_HEADrecords the commit which you are cherry-picking when you run git cherry-pick.
blog comments powered by Disqus