Hi again, Jonathan Nieder writes: > Ramkumar Ramachandra wrote: >> Change this so that the sequencer state is cleared when a conflict is >> encountered in the last commit. > > This defeats the point of keeping a ".git/sequencer/head" file. Why > not remove the cherry-pick state when it is known no longer to be needed, > namely after the conflict resolution is commited? Sounds nice in theory, but how do we do it? Remove the state at "git commit" time? I've already thought about the problem and presented my arguments here [1]. [1]: http://article.gmane.org/gmane.comp.version-control.git/177465 -- Ram -- 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