On 29 July 2013 20:50, Felipe Contreras <felipe.contreras@xxxxxxxxx> wrote: > On Mon, Jul 29, 2013 at 8:42 PM, Hilco Wijbenga > <hilco.wijbenga@xxxxxxxxx> wrote: >> Hi all, >> >> I have a (public) "feature" branch that has been kept up-to-date with >> "master" by regularly merging master back into it. I would now like to >> get all the changes from feature but not any of the commits. >> Basically, I want to replay all of feature's commits without creating >> those commits. >> >> I thought something like >> >> git cherry-pick -n abcd^..feature >> >> should do the trick (while on master, where abcd is the SHA-1 of the >> commit where feature was created) but I get conflicts. >> >> First, why the conflicts? I have done all the merges so cherry-pick >> should simply be able to replay them? Second, what is the correct way >> of doing this? > > Perhaps > > % git cherry-pick -n --no-merges --right-only --topo-order > --cherry-pick abcd^..feature Thank you for the suggestion but this still gives me conflicts. -- 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