git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Johnny Lee <johnnylee194@gmail.com>
To: git@vger.kernel.org
Subject: [Question] Why sometimes the unmerged file doesn't contains any  conflicts
Date: Mon, 13 Apr 2009 10:35:06 +0800	[thread overview]
Message-ID: <488807870904121935nab40117n56070570ecd31aa7@mail.gmail.com> (raw)

Hi all,

Sometimes when I merge two branches, the unmerged files don't contain
any conflicts.
When I edit the file, I can't find any conflict information. Usually
all I have to do is manually "git add" them.

I do the merge with a clean workspace, all changes have been committed.
This doesn't happen all the time, usually the unmerged files contains
the correct conflict information inside.

Do you know what's going on here?
The version of my git is: 1.6.2.1

Thanks for your consideration.

Regards,
Johnny

-- 
we all have our crosses to bear

             reply	other threads:[~2009-04-13  2:36 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-04-13  2:35 Johnny Lee [this message]
2009-04-13  2:47 ` [Question] Why sometimes the unmerged file doesn't contains any conflicts Junio C Hamano
2009-04-13  3:43   ` Johnny Lee

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=488807870904121935nab40117n56070570ecd31aa7@mail.gmail.com \
    --to=johnnylee194@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).