git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: how do I resolve this merge manually + mergetool bug

From
Caleb Cushing <xenoterracide@gmail.com>
Date
Feb 24, 2009, 07:19 UTC
Message-ID
<81bfc67a0902232319t7525e3b3n74b667257024800b@mail.gmail.com>
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
Previous: Junio C HamanoNext: Charles Bailey
Message 5 of 8 in “how do I resolve this merge manually + mergetool bug”
  1. Caleb CushingFeb 24, 2009
  2. Junio C HamanoFeb 24, 2009
  3. Caleb CushingFeb 24, 2009
  4. Junio C HamanoFeb 24, 2009
  5. Caleb CushingFeb 24, 2009
  6. Charles BaileyFeb 24, 2009
  7. Caleb CushingFeb 24, 2009
  8. Charles BaileyFeb 24, 2009

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.