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

Re: Opinions on changing add/add conflict resolution?

From
HWHilco Wijbenga <hilco.wijbenga@gmail.com>
Date
Mar 12, 2018, 23:08 UTC
Message-ID
<CAE1pOi3jbLyZ7zgCO5J_BrQurrxZvm5RH+ZjXTTBf4MMmVOduA@mail.gmail.com>
In-Reply-To
<20180312213521.GB58506@aiede.svl.corp.google.com>
On Mon, Mar 12, 2018 at 2:35 PM, Jonathan Nieder <jrnieder@gmail.com> wrote:
Show 5 quoted lines
> Interesting.  I would be tempted to resolve this inconsistency the
> other way: by doing a half-hearted two-way merge (e.g. by picking one
> of the two versions of the colliding file) and marking the path as
> conflicted in the index.  That way it's more similar to edit/edit,
> too.

If work is going to be done in this area, would it be possible to include making auto-merging (in general) optional? Preferably, configurable by file (or glob) but I'd already be happy with a global setting to opt out.

I keep running into bugs caused by Git's automatic merging. (And I don't see how this could be improved without teaching Git the specifics of various file types.) It's especially hard when rebasing large numbers of commits. The bug is introduced early on but I will not notice anything is wrong until late in the rebase.

(Since I seem to keep asking for things that turn out to already have been implemented ... if this is already possible please just point me to the right setting and consider me a happy camper. :-) )

Previous: Jonathan NiederNext: Jonathan Nieder
Message 5 of 22 in “Opinions on changing add/add conflict resolution?”
  1. Elijah NewrenMar 12, 2018
  2. Jonathan NiederMar 12, 2018
  3. Elijah NewrenMar 12, 2018
  4. Jonathan NiederMar 12, 2018
  5. Hilco WijbengaMar 12, 2018
  6. Jonathan NiederMar 12, 2018
  7. Elijah NewrenMar 13, 2018
  8. Elijah NewrenMar 13, 2018
  9. Junio C HamanoMar 13, 2018
  10. Elijah NewrenMar 13, 2018
  11. Junio C HamanoMar 13, 2018
  12. Elijah NewrenMar 13, 2018
  13. Junio C HamanoMar 13, 2018
  14. Elijah NewrenMar 13, 2018
  15. Jonathan NiederMar 13, 2018
  16. Elijah NewrenMar 13, 2018
  17. Junio C HamanoMar 13, 2018
  18. Ævar Arnfjörð BjarmasonMar 12, 2018
  19. Fwd: Opinions on changing add/add conflict resolution?Elijah Newren, Mar 13, 2018
  20. Junio C HamanoMar 13, 2018
  21. Ævar Arnfjörð BjarmasonMar 13, 2018
  22. Elijah NewrenMar 13, 2018

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.