git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: chirin <takonatto@gmail.com>
To: git@vger.kernel.org
Subject: Git beginner - Need help understanding
Date: Mon, 26 Dec 2011 19:12:17 -0800 (PST)	[thread overview]
Message-ID: <1324955537875-7129186.post@n2.nabble.com> (raw)

I'm just beginning to use Git in my workplace, and (rather shamefully) have
never heard of Git until now. While I pore over the stacks of documentations
for beginners, could someone help me understand this issue I've been having? 

Every time a colleague updates a file, I would not be able to pull due to
merge conflicts - even though I have never made any changes to the
repository. I'd try  and then  again, but it would still give the same merge
conflict. The only way I could pull currently is to do a git commit (even
without changes), and then git pull.

If this was SVN, I could simply resolve this with Update. What am I missing,
and what should I be looking for?

Thanks in advance..

--
View this message in context: http://git.661346.n2.nabble.com/Git-beginner-Need-help-understanding-tp7129186p7129186.html
Sent from the git mailing list archive at Nabble.com.

             reply	other threads:[~2011-12-27  3:12 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-12-27  3:12 chirin [this message]
     [not found] ` <CA++fsGGEv=jS4YNEUCxTwZ3pZc7HbbmoPbDH+MamrqamxrsADA@mail.gmail.com>
2011-12-27  6:34   ` Git beginner - Need help understanding Dov Grobgeld
2011-12-27  7:02     ` chirin
2011-12-27 19:50       ` Junio C Hamano
2011-12-28  1:38         ` chirin
2011-12-28  8:05           ` Dov Grobgeld

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=1324955537875-7129186.post@n2.nabble.com \
    --to=takonatto@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).