Johannes Schindelin <Johannes.Schindelin@xxxxxx> writes: > On Wed, 31 Oct 2007, Sergei Organov wrote: > >> Yes, and that's the problem. Why 'git --continue' didn't just skip this >> patch that *already became no-op* after conflict resolution and forced >> me to explicitly use 'git --skip' instead? > > Isn't that obvious? To prevent you from accidentally losing a commit. In case it is not obvious... A rebase conflict resolution that results in emptiness is a rather rare event (especially because rebase drops upfront the identical changes from the set of commits to be replayed), but it does happen. One could argue that "rebase --continue" can notice that the resolved index is identical to the tree of the HEAD commit and skip it automatically. Given an index that is identical to HEAD, however, it is not easy to safely determine if that is because the patch did not apply at all, or the patch was applied with conflicts _and_ the user decided to make the patch a no-op by resolving. The automatic droppage of the commit needs to happen only on the latter and never on the former. - 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
