git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Git beginner - Need help understanding

From
Cchirin <takonatto@gmail.com>
Date
Dec 27, 2011, 03:12 UTC
Message-ID
<1324955537875-7129186.post@n2.nabble.com>

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.

Next: Dov Grobgeld
Message 1 of 6 in “Git beginner - Need help understanding”
  1. chirinDec 27, 2011
  2. Dov GrobgeldDec 27, 2011
  3. chirinDec 27, 2011
  4. Junio C HamanoDec 27, 2011
  5. chirinDec 28, 2011
  6. Dov GrobgeldDec 28, 2011

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.