From: Junio C Hamano <junkio@cox.net>
To: ltuikov@yahoo.com
Cc: git@vger.kernel.org
Subject: Re: resolve (merge) problems
Date: Thu, 01 Dec 2005 17:58:21 -0800 [thread overview]
Message-ID: <7vpsog9s5e.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <20051202015039.93047.qmail@web31811.mail.mud.yahoo.com> (Luben Tuikov's message of "Thu, 1 Dec 2005 17:50:39 -0800 (PST)")
Luben Tuikov <ltuikov@yahoo.com> writes:
> Ok, if your patch below resolves the bug (please see my
> other email just posted) please submit it. (I'm hitting
> this bug everytime there's a file deleted from the
> kernel tree and I try to merge.)
Sorry to hear that. The patch I sent you is already pushed out
and mirrored the public machines.
The failure from '-s recursive' (lack of heapq) makes me suspect
that your Python installation is too old. The 'resolve' method
you've been using should work fine for this case; otherwise
replace '-s recursive' in the message from Linus with '-s
resolve' for the 'git merge' commandline, like this:
$ git merge -s resolve "merge linus' tree" HEAD master
next prev parent reply other threads:[~2005-12-02 1:58 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-12-01 23:18 resolve (merge) problems Luben Tuikov
2005-12-01 23:58 ` Junio C Hamano
2005-12-02 0:07 ` Luben Tuikov
2005-12-02 0:58 ` Junio C Hamano
2005-12-02 1:50 ` Luben Tuikov
2005-12-02 1:58 ` Junio C Hamano [this message]
2005-12-02 2:05 ` Luben Tuikov
2005-12-02 5:09 ` Junio C Hamano
2005-12-02 13:59 ` Luben Tuikov
2005-12-02 0:07 ` Linus Torvalds
2005-12-02 1:44 ` Luben Tuikov
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=7vpsog9s5e.fsf@assigned-by-dhcp.cox.net \
--to=junkio@cox.net \
--cc=git@vger.kernel.org \
--cc=ltuikov@yahoo.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.