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

Glossary: trivial, clean, evil merge

From
Jakub Narebski <jnareb@gmail.com>
Date
May 17, 2007, 10:39 UTC
Message-ID
<200705171239.24300.jnareb@gmail.com>
  Glossary: trivial, clean, evil merge
              or
Merge flavours, and how to recognize them

What is the definition of a trivial merge? Is it tree-level merge, for which git-diff -c output would be empty?

What is the definition of clean merge? Is it merge without conflicts? How to name merge for which git-diff --cc output is empty: simple merge perhaps? I think it does not need to be clean merge in the "no conflicts" meaning.

What is the definition of evil merge? Is it merge for which merge commit is different from all the parents? How to name merge for which git-diff --cc output is non empty, then?

-- 
Jakub Narebski
Poland
Next: Jakub Narebski
Message 1 of 2 in “Glossary: trivial, clean, evil merge”
  1. Jakub NarebskiMay 17, 2007
  2. [RFC] How to show merge commits in gitweb?Jakub Narebski, May 26, 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.