From: merlyn@stonehenge.com (Randal L. Schwartz)
To: git@vger.kernel.org
Subject: rsync update appears broken now
Date: 20 Oct 2005 05:47:42 -0700 [thread overview]
Message-ID: <86vezs9wy9.fsf@blue.stonehenge.com> (raw)
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!
next reply other threads:[~2005-10-20 12:48 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-10-20 12:47 Randal L. Schwartz [this message]
2005-10-20 13:08 ` rsync update appears broken now Alex Riesen
2005-10-20 14:12 ` Randal L. Schwartz
2005-10-20 14:24 ` Alex Riesen
2005-10-20 17:48 ` Linus Torvalds
2005-10-20 20:48 ` Junio C Hamano
2005-10-20 21:32 ` Linus Torvalds
2005-10-20 23:37 ` Junio Hamano
2005-10-20 23:41 ` Johannes Schindelin
2005-10-20 23:49 ` Linus Torvalds
2005-10-21 0:01 ` Johannes Schindelin
2005-10-21 0:19 ` Linus Torvalds
2005-10-21 0:34 ` Petr Baudis
2005-10-20 23:47 ` Linus Torvalds
2005-10-21 0:26 ` Junio C Hamano
2005-10-21 0:52 ` Linus Torvalds
2005-10-21 13:49 ` Randal L. Schwartz
2005-10-21 15:26 ` Linus Torvalds
2005-10-20 14:15 ` Morten Welinder
2005-10-20 18:03 ` dave morgan
2005-10-20 15:03 ` Stephen C. Tweedie
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=86vezs9wy9.fsf@blue.stonehenge.com \
--to=merlyn@stonehenge.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.