git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Newbie: report of first experience with git-rebase.

From
Junio C Hamano <gitster@pobox.com>
Date
Oct 31, 2007, 21:39 UTC
Message-ID
<7vhck7gdzs.fsf@gitster.siamese.dyndns.org>
In-Reply-To
<Pine.LNX.4.64.0710312111170.4362@racer.site>
Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
Show 7 quoted lines
> 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.

Previous: J. Bruce FieldsNext: David Kastrup
Message 9 of 20 in “Newbie: report of first experience with git-rebase.”
  1. Sergei OrganovOct 31, 2007
  2. Björn SteinbrinkOct 31, 2007
  3. Sergei OrganovOct 31, 2007
  4. Johannes SchindelinOct 31, 2007
  5. J. Bruce FieldsOct 31, 2007
  6. Steven GrimmOct 31, 2007
  7. Daniel BarkalowOct 31, 2007
  8. J. Bruce FieldsOct 31, 2007
  9. Junio C HamanoOct 31, 2007
  10. David KastrupOct 31, 2007
  11. Nicolas PitreNov 1, 2007
  12. Sergei OrganovNov 1, 2007
  13. Johannes SchindelinNov 1, 2007
  14. J. Bruce FieldsNov 1, 2007
  15. Junio C HamanoNov 1, 2007
  16. Andreas EricssonNov 2, 2007
  17. Junio C HamanoNov 2, 2007
  18. David KastrupOct 31, 2007
  19. Alex RiesenOct 31, 2007
  20. Andreas EricssonNov 2, 2007

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.