Glossary: trivial, clean, evil merge
From: Jakub Narebski <hidden>
Date: 2016-06-15 22:43:10
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