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

Re: [PATCH v2] Teach merge the '[-e|--edit]' option

From
Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date
Oct 10, 2011, 07:50 UTC
Message-ID
<vpqty7h2sla.fsf@bauges.imag.fr>
In-Reply-To
<m3ehyl1g5v.fsf@localhost.localdomain>
Jakub Narebski <jnareb@gmail.com> writes:
> Yet another issue is if we should blindly trust automatic merge resolution.
> It is considered a good practice by some to always check (e.g. by compiling
> and possibly also running tests) the result of merge, whether it required
> merge conflict resolution or not.

I agree that trusting merge blindly is bad, but still, if there are no merge conflicts, and if the merge is broken, I'd prefer commiting a fixup patch right after the merge than fixing it before committing. Because if the merge needs a fix, it usually means something tricky that deserves its own patch and commit message. At worse, one can still reset --merge HEAD^.

One other issue with not committing automatically is for beginners. I see that all the time when the merge has conflicts. newbies fix the conflicts, and when they're done: "fine, conflicts solved, let's continue hacking" without committing. The resulting history is totally messy because it mixes merges and actual edits. For these users, not committing automatically in the absence of conflict would make the situation even worse.

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/
Previous: Jakub NarebskiNext: Junio C Hamano
Message 14 of 15 in “Teach merge the '[-e|--edit]' option”
  1. Teach merge the '[-e|--edit]' optionJay Soffian, Oct 7, 2011
  2. Junio C HamanoOct 7, 2011
  3. Jay SoffianOct 7, 2011
  4. Junio C HamanoOct 7, 2011
  5. Jay SoffianOct 7, 2011
  6. Jay SoffianOct 7, 2011
  7. Junio C HamanoOct 7, 2011
  8. Teach merge the '[-e|--edit]' optionJay Soffian, Oct 7, 2011
  9. Junio C HamanoOct 7, 2011
  10. Jay SoffianOct 8, 2011
  11. Junio C HamanoOct 9, 2011
  12. Junio C HamanoOct 10, 2011
  13. Jakub NarebskiOct 10, 2011
  14. Matthieu MoyOct 10, 2011
  15. Junio C HamanoOct 10, 2011

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.