From: "H. Peter Anvin" <hpa@zytor.com>
To: martin.langhoff@gmail.com
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: Moved files and merges
Date: Sat, 03 Sep 2005 21:14:21 -0700 [thread overview]
Message-ID: <431A749D.9090607@zytor.com> (raw)
In-Reply-To: <46a038f90509021720417a9b59@mail.gmail.com>
Martin Langhoff wrote:
>
> Probably should be hacked into cg-merge. When the merge reports a file
> is missing, what happens? Does it leave a .rej file or anything?
>
The error message is:
MERGE ERROR: nfsmount/mount.c: Not handling case
3225ecdf8d172cda2a6ea5276af0d3edc566a0e7 -> ->
c02da9e576a525a2a49da930107ed3936a45b6e1
MERGE ERROR: nfsmount/sunrpc.c: Not handling case
037e33e84ebcee4e097a009439c1bab7143ef92d -> ->
e2fe5f8b728b5235010ed317e759222179dcd45c
Conflicts during merge. Do cg-commit after resolving them.
-hpa
next prev parent reply other threads:[~2005-09-04 4:17 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-09-02 23:59 Moved files and merges H. Peter Anvin
2005-09-03 0:20 ` Martin Langhoff
2005-09-04 4:14 ` H. Peter Anvin [this message]
2005-09-03 1:36 ` Junio C Hamano
2005-09-03 8:25 ` Junio C Hamano
2005-09-03 18:06 ` Fredrik Kuivinen
2005-09-03 18:53 ` Junio C Hamano
2005-09-03 18:46 ` Junio C Hamano
2005-09-03 19:05 ` Sam Ravnborg
2005-09-03 19:32 ` Junio C Hamano
2005-09-03 22:03 ` Sam Ravnborg
2005-09-04 7:32 ` Junio C Hamano
2005-09-04 18:28 ` Daniel Barkalow
2005-09-04 19:10 ` Junio C Hamano
2005-09-05 15:16 ` H. Peter Anvin
2005-09-05 15:47 ` Linus Torvalds
2005-09-05 16:37 ` H. Peter Anvin
2005-09-05 18:08 ` Junio C Hamano
2005-09-05 18:33 ` Junio C Hamano
2005-09-05 18:43 ` H. Peter Anvin
2005-09-04 8:27 ` Junio C Hamano
2005-09-03 19:21 ` Fredrik Kuivinen
2005-09-03 18:59 ` Sam Ravnborg
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=431A749D.9090607@zytor.com \
--to=hpa@zytor.com \
--cc=git@vger.kernel.org \
--cc=martin.langhoff@gmail.com \
/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.