From: Caleb Cushing <xenoterracide@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: how do I resolve this merge manually + mergetool bug
Date: Tue, 24 Feb 2009 02:19:32 -0500 [thread overview]
Message-ID: <81bfc67a0902232319t7525e3b3n74b667257024800b@mail.gmail.com> (raw)
In-Reply-To: <7vr61ol2yn.fsf@gitster.siamese.dyndns.org>
On Tue, Feb 24, 2009 at 2:16 AM, Junio C Hamano <gitster@pobox.com> wrote:
> "git update-index --force-remove profiles/package.mask" should work
> better. I tend to trust plumbing a lot more than Porcelain for these
> corner cases.
works. awesome! thanks for the help, I've been banging my head against
how to do this (without pain++ ) for a couple of days.
--
Caleb Cushing
http://xenoterracide.blogspot.com
next prev parent reply other threads:[~2009-02-24 7:21 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-24 6:04 how do I resolve this merge manually + mergetool bug Caleb Cushing
2009-02-24 6:31 ` Junio C Hamano
2009-02-24 6:52 ` Caleb Cushing
2009-02-24 7:16 ` Junio C Hamano
2009-02-24 7:19 ` Caleb Cushing [this message]
2009-02-24 7:47 ` Charles Bailey
2009-02-24 8:32 ` Caleb Cushing
2009-02-24 9:13 ` Charles Bailey
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=81bfc67a0902232319t7525e3b3n74b667257024800b@mail.gmail.com \
--to=xenoterracide@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).