Re: 'Theirs' merge between branches on a binary file.

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

 



"Tim Visher" <tim.visher@xxxxxxxxx> writes:

> On Mon, Dec 22, 2008 at 4:11 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote:
>
>> Do you mean during a conflicted merge resolution you would want to check
>> their version out of the index and declare that it is the merge result?
>
> Sure.

That sounds like "git checkout --theirs"...
--
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