On 20 Oct 2005 05:47:42 -0700, Randal L. Schwartz <merlyn@stonehenge.com> wrote: > > Doing my daily git-pull now broke in this way (using yesterday's git version): > > sent 1196 bytes received 155984 bytes 4555.94 bytes/sec > total size is 4511741 speedup is 28.70 > * committish: 6e1c6c103c522d01829f3a63992a023ff031e851 > branch 'master' of rsync://rsync.kernel.org/pub/scm/git/git > * refs/heads/origin: does not fast forward to branch 'master' of rsync://rsync.kernel.org/pub/scm/git/git; > not updating. > Trying really trivial in-index merge... > fatal: Merge requires file-level merging > Nope. > Trying simple merge. > Simple merge failed, trying Automatic merge. > Auto-merging fetch-pack.c. > merge: warning: conflicts during merge > ERROR: Merge conflict in fetch-pack.c. > fatal: merge program failed > Automatic merge failed; fix up by hand Absolutely normal pull into a changed repository. Just fix the conflict (in fetch-pack.c, look for >>>), git-update-index the file and commit. Doesn't look like a problem at all. - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.htmlReceived on Thu Oct 20 23:11:08 2005
This archive was generated by hypermail 2.1.8 : 2005-10-20 23:11:11 EST