From: Jakub Narebski Date: Thu, 17 May 2007 10:39:23 GMT Subject: Glossary: trivial, clean, evil merge 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