git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Marcelo de Moraes Serpa <celoserpa@gmail.com>
To: git@vger.kernel.org
Subject: Pulled files with "new file" status
Date: Mon, 20 Jul 2009 00:45:27 -0500	[thread overview]
Message-ID: <1e5bcefd0907192245j19aac1aar804a0e3bd637b46b@mail.gmail.com> (raw)

Hello,

I just went through an interesting situation and maybe someone could
enlighten-me. I pulled and got a conflict. I solved the conflict, git
added the file, and committed. I git pulled again and get the updates
from a friend, but the intriguing thing is that, the files that he
added appeared as "new file" for me too. Why's that? I haven't been
the one who added the file, he added it, why git would pull objects
and tell me they are new ?

Thanks in advance!

Marcelo.

             reply	other threads:[~2009-07-20  5:45 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-07-20  5:45 Marcelo de Moraes Serpa [this message]
2009-07-20  7:40 ` Pulled files with "new file" status Johannes Sixt

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=1e5bcefd0907192245j19aac1aar804a0e3bd637b46b@mail.gmail.com \
    --to=celoserpa@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).