From 34c7e2a7879fb905ad15e9ce18d1e1979a42aa5b Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Tue, 3 Sep 2013 20:39:47 +0200 Subject: add evil merge to glossary MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- using-git.texinfo | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/using-git.texinfo b/using-git.texinfo index e796f86..31739c3 100644 --- a/using-git.texinfo +++ b/using-git.texinfo @@ -1348,7 +1348,12 @@ with the command @command{cd}. The working tree is dirty if it contains uncommited modifications. -@c @item evil merge +@item evil merge +A merge that introduces changes that do not +appear in any parent. Variable name conflicts +can be a cause of evil merges. This is why you +do not rebase your commits. + @c @item fast-forward @c @item fetch @c @item gitfile -- cgit v1.2.3-70-g09d2