다음은 내가 한 일입니다. 나는 두 명의 머리가 필요하지 않습니다. 이 문제를 어떻게 해결할 수 있습니까? 다시 하나에 두 개의 머리를 병합하라는 메시지를 표시합니다머큐리얼 헤드
~/src: hg push
pushing to ssh://[email protected]/Neil/project
ruprojecting ssh [email protected] 'hg -R Neil/project serve --stdio'
searching for changes
new remote heads on branch 'default'
new remote head e04226a528b5
abort: push creates new remote head e04226a528b5!
(did you forget to merge? use push -f to force)
~/src: hg push -f
pushing to ssh://[email protected]/Neil/project
ruprojecting ssh [email protected] 'hg -R Neil/project serve --stdio'
searching for changes
14 changesets found
remote: adding changesets
remote: adding manifests
remote: adding file changes
remote: added 14 changesets with 30 changes to 67 files (+1 heads)
remote: bb/acl: Neil is allowed. accepted payload.
~/src: hg pull
ruprojecting ssh [email protected] 'hg -R Neil/project serve --stdio'
pulling from ssh://[email protected]/Neil/project
searching for changes
no changes found
~/src: hg heads
changeset: 1177:e04226a528b5
tag: tip
parent: 1175:b5f77a454e64
user: Neil
date: Sat Feb 25 09:12:48 2012 -0800
files: src/experiments/distribution_combination.py
changeset: 1176:f7cc8d94f4f3
parent: 1162:b680e6f93f80
user: Neil
date: Thu Feb 23 15:32:36 2012 -0800
files: .hgignore src/CMakeLists.txt etc.
-1 : 그것에 대한 의견이없는 출력이 복사 되었기 때문에 –