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

Re: Fix interesting git-rev-list corner case

From
POPeter Osterlund <petero2@telia.com>
Date
Jul 30, 2005, 20:50 UTC
Message-ID
<m3fytwm313.fsf@telia.com>
In-Reply-To
<Pine.LNX.4.58.0507300913000.29650@g5.osdl.org>
Linus Torvalds <torvalds@osdl.org> writes:
Show 9 quoted lines
> On Sat, 30 Jul 2005, Peter Osterlund wrote:
> > 
> > I have problems pulling linux kernel changes from
> > 33ac02aa4cef417871e128ab4a6565e751e5f3b2 to
> > b0825488a642cadcf39709961dde61440cb0731c into my local tree. At first
> > I thought your patch would fix it, but it doesn't:
> 
> No, this is a merge conflict failure, and you simply have conflicts in the
> tree. git did everything right, it just couldn't do an automatic merge.

OK, but note that I didn't do any editing of any local files myself. Both commit ids are from your public linux kernel git tree. What I did was equivalent to:

1. rsync from rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git/
2. waited a day or so.
3. git-pull-script from the same kernel.org repository.

Is it expected that you end up with merge conflicts in this case? If that's the case, is there a better way to pull changes that doesn't involve having to resolve conflicts in files you didn't even know existed?

I think it should be possible to just fast forward to the new HEAD in this situation.

-- 
Peter Osterlund - petero2@telia.com
http://web.telia.com/~u89404340
Previous: Linus TorvaldsNext: Linus Torvalds
Message 8 of 15 in “Fix interesting git-rev-list corner case”
  1. Linus TorvaldsJul 29, 2005
  2. Ryan AndersonJul 30, 2005
  3. A Large Angry SCMJul 30, 2005
  4. Linus TorvaldsJul 30, 2005
  5. Linus TorvaldsJul 30, 2005
  6. Peter OsterlundJul 30, 2005
  7. Linus TorvaldsJul 30, 2005
  8. Peter OsterlundJul 30, 2005
  9. Linus TorvaldsJul 30, 2005
  10. Peter OsterlundJul 30, 2005
  11. Linus TorvaldsJul 30, 2005
  12. Linus TorvaldsJul 30, 2005
  13. Peter OsterlundJul 30, 2005
  14. Linus TorvaldsJul 31, 2005
  15. Junio C HamanoJul 31, 2005

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.