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

Re: Improving merge of tricky conflicts

From
Junio C Hamano <gitster@pobox.com>
Date
Jul 24, 2020, 23:04 UTC
Message-ID
<xmqqft9gjz0m.fsf@gitster.c.googlers.com>
In-Reply-To
<87tuxwimvm.fsf@osv.gnss.ru>
Sergey Organov <sorganov@gmail.com> writes:
> Anyway, my primary point was that I still might wish to do exactly reset
> and start from scratch, and then I miss --conflict option, that in turn
> makes its existence less than 100% less sense than configuration
> variable, my estimation being about 80%.

As with other uses of "update working tree files from elsewhere" use of "checkout", "--merge/--conflict=<style>" checkout does take pathspec to specify what paths are to be updated. Nothing stops you to give "." (everything under the sun) pathspec there, so I do not really see the point of insisting "I want to start and redo from scratch".

Unless the reason is "because that is the way I am used to", that is. Surely, we can start and redo from scratch any operation, not limited to merges, by removing the entire repository and cloning it again from scratch. I am trying to give our users tools to help them not get into that habit and instead always make forward progress without discarding work that has already been done.

Previous: Sergey OrganovNext: Bono Stebler
Message 24 of 25 in “Improving merge of tricky conflicts”
  1. B. SteblerJul 21, 2020
  2. Johannes SixtJul 22, 2020
  3. Jeff KingJul 22, 2020
  4. Junio C HamanoJul 22, 2020
  5. Jeff KingJul 23, 2020
  6. Junio C HamanoJul 24, 2020
  7. Jeff KingJul 24, 2020
  8. Junio C HamanoJul 24, 2020
  9. Martin von ZweigbergkJan 16, 2021
  10. Jeff KingJan 21, 2021
  11. Martin von ZweigbergkJan 21, 2021
  12. Jeff KingJan 21, 2021
  13. Sergey OrganovJul 22, 2020
  14. Junio C HamanoJul 22, 2020
  15. Sergey OrganovJul 22, 2020
  16. Jeff KingJul 23, 2020
  17. Sergey OrganovJul 23, 2020
  18. Junio C HamanoJul 23, 2020
  19. Jacob KellerJul 24, 2020
  20. Junio C HamanoJul 24, 2020
  21. Sergey OrganovJul 24, 2020
  22. Junio C HamanoJul 24, 2020
  23. Sergey OrganovJul 24, 2020
  24. Junio C HamanoJul 24, 2020
  25. Bono SteblerJul 22, 2020

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.