Re: cherry picking and merge

From: Mike Stump <mikestump@comcast.net>
Date: Aug 1, 2014, 23:47 UTC
Message-ID: <5EEA8572-291D-4D8C-A38A-E09E24E81A77@comcast.net>
In-Reply-To: <20140801205040.GT12427@google.com>

On Aug 1, 2014, at 1:50 PM, Jonathan Nieder <jrnieder@gmail.com> wrote:

Show 5 quoted lines

> 
>       And on the other hand a one-patch-at-a-time merge would
>       try to apply X (with no effect, since it's already applied)
>       and then try to apply the revert of X.  The net effect would
>       be to revert X from "master" (bad)!

Yeah, I appreciate that.  I know the type of user that would do that, and I understand why you would want to do that and even do that by default.

However, as an expert user, I don’t need that particular type of hand holding given the cost of more conflicts and would like an option to let me to choose to have fewer conflicts when merging.