Re: Problem with merge when renaming

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

 



"David Euresti" <evelio@xxxxxxxxx> writes:

> I think I found a problem when you move a file into a directory of the
> same name.  Here's what I did.

Two questions.

 (1) git --version?

 (2) if you do "git merge -s resolve" instead of just "git
     merge", do you see a difference?
-
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