On Wed, Apr 28, 2010 at 3:50 PM, Jonathan Nieder <jrnieder@xxxxxxxxx> wrote: > Eugene Sajine wrote: > >> the automatic cherry-pick failed and caused conflicts, so in >> order to to cancel the whole operation i had to do the following: >> >> 1. mark the conflicting files as resolved (without even resolving >> them) by doing git add. >> 2. unstage all files staged for commit as a result of incomplete cherry picking >> 3. manually checkout touched files to their correct state (git checkout file) >> >> and then i was able to repeat cherry-picking with correct commits. >> >> Is there a better way? > > git reset --merge > > Ideas for where this should be put in the git-cherry-pick.txt manual? > That's interesting - thanks a lot! Yes, it wold be nice to have it mentioned somewhere in help for cherry-picking. Thanks, Eugene -- 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