Jeff King <peff@xxxxxxxx> writes: > I put it in rebase and not straight into "git am", as I'm not sure that > "am" would want to share the same behavior. I'm not sure why we haven't > done this up until now. Maybe there is some corner case I'm not thinking > of where the user would want to do something besides skip when we hit > this situation. I dunno. I think the "rebase --continue" behaviour was more or less deliberate (I do not necessarily agree with the reasoning, though). It is to ensure that the user has a chance to examine the situation and acknowledge that it is fine to completely drop the now obsoleted change, as having to adjust the change to an updated base, even with conflict resolution, may be common, it is a rare and notable event that the resolution ends up being empty. -- 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