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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Tue, Feb 24, 2009 at 2:16 AM, Junio C Hamano <gitster@xxxxxxxxx> 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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux