From: Randal L. Schwartz <merlyn@stonehenge.com>
Date: Thu, 20 Oct 2005 12:47:42 GMT
Subject: rsync update appears broken now
Message-ID: <86vezs9wy9.fsf@blue.stonehenge.com>


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


-- 
Randal L. Schwartz - Stonehenge Consulting Services, Inc. - +1 503 777 0095
<merlyn@stonehenge.com> <URL:http://www.stonehenge.com/merlyn/>
Perl/Unix/security consulting, Technical writing, Comedy, etc. etc.
See PerlTraining.Stonehenge.com for onsite and open-enrollment Perl training!