From: Jakub Narebski <jnareb@gmail.com>
To: git@vger.kernel.org
Subject: Glossary: trivial, clean, evil merge
Date: Thu, 17 May 2007 12:39:23 +0200 [thread overview]
Message-ID: <200705171239.24300.jnareb@gmail.com> (raw)
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 reply other threads:[~2007-05-17 22:51 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-05-17 10:39 Jakub Narebski [this message]
2007-05-26 23:10 ` [RFC] How to show merge commits in gitweb? Jakub Narebski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200705171239.24300.jnareb@gmail.com \
--to=jnareb@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).