From: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
To: Dilip M <dilipm79@gmail.com>
Cc: Sverre Rabbelier <srabbelier@gmail.com>, git <git@vger.kernel.org>
Subject: Re: git log --graph
Date: Mon, 12 Oct 2009 08:54:36 +0200 [thread overview]
Message-ID: <vpqtyy5rtjn.fsf@bauges.imag.fr> (raw)
In-Reply-To: <c94f8e120910112001l50f9332fs43d0762bbd9207a3@mail.gmail.com> (Dilip M.'s message of "Mon\, 12 Oct 2009 08\:31\:59 +0530")
Dilip M <dilipm79@gmail.com> writes:
> Understood. it shows only when I have merged conflicts!
>
> In case, it is a fast forward merge. It doesn't show. Which is good :)
Fast-forward and merge conflicts are two different things. Non-fast
forward occurs when you merge two branches which are not a direct
ancestor of each other, i.e. both have commits that the other do not
have.
In case of non-fast forward, if you didn't touch the same file in both
branches, the merge is still trivial and conflict-free. If you touched
the same files, then Git has to apply in-file merge strategy, but that
doesn't mean you'll get conflicts either. Conflicts will occur when
you touched the same part of the same file.
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
next prev parent reply other threads:[~2009-10-12 7:03 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-10-11 18:27 git log --graph Dilip M
2009-10-11 18:35 ` Sverre Rabbelier
2009-10-11 19:40 ` Matthieu Moy
2009-10-11 20:30 ` Jakub Narebski
2009-10-12 3:01 ` Dilip M
2009-10-12 6:54 ` Matthieu Moy [this message]
2009-10-12 5:08 ` B Smith-Mannschott
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=vpqtyy5rtjn.fsf@bauges.imag.fr \
--to=matthieu.moy@grenoble-inp.fr \
--cc=dilipm79@gmail.com \
--cc=git@vger.kernel.org \
--cc=srabbelier@gmail.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.