From: Jonathan Nieder <jrnieder@gmail.com>
Date: Wed, 27 Jul 2011 05:17:55 GMT
Subject: Re: [PATCH 16/18] revert: Remove sequencer state when no commits are pending
Message-ID: <20110727051755.GK18470@elie>
In-Reply-To: <1311736755-24205-17-git-send-email-artagnon@gmail.com>

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?