Re: Has the git shell revert been done so master should work?

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

 



I was doing it correctly, but this is what I am seeing.

$ git clone git://git.kernel.org/pub/scm/git/git.git git
$ cd git
$ git checkout master
Already on "master"
$ git cherry-pick 4cfc24af
fatal: exec merge-recursive failed.
Automatic cherry-pick failed.  After resolving the conflicts,
mark the corrected paths with 'git add <paths>' or 'git rm <paths>' and commit the result. When commiting, use the option '-c 4cfc24a' to retain authorship and message.

So I was attempting to do it right, but it just did not work.

BTW, is there a way to get all the messages sent since last night. Some how I lost my subscription to the git email list. I re-subscribe at around 1:30 MDT. I really would like to get all the email I mised.

Thanks,

--
Boyd Gerber <gerberb@xxxxxxxxx>
ZENEZ	1042 East Fort Union #135, Midvale Utah  84047
--
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