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

Re: git pull with "no common commits" : danger?

From
AAghiles <aghilesk@gmail.com>
Date
Apr 8, 2010, 19:55 UTC
Message-ID
<t2j3abd05a91004081255h58d2aca3leeb41adf53dc6a4f@mail.gmail.com>
In-Reply-To
<20100408054349.GA6067@progeny.tock>
Jonathan Nieder <jrnieder@gmail.com> writes:
Show 12 quoted lines
>
> ...
>
> On the other hand, ‘git pull’ is a little different.  The fetch has
> very little cost because it’s interruptible, but the merge could
> result in two unrelated pieces of history being merged, requiring
> the user to use ‘git reset --keep HEAD^’ to get back to the
> previous state.  A more likely outcome is a merge conflict, requiring
> ‘git reset --merge’ to recover.
>
> Can we make this less painful?  Is it worth adding yet another option
> to ‘git pull’ to avoid this pain?  I don’t know.

That is exactly the case I was talking about. I never lost any data because of this and considering what Junio Hamano is saying I probably should just continue to do the 'git reset'.

  -- aghiles
Previous: Jonathan NiederNext: Junio C Hamano
Message 5 of 7 in “git pull with "no common commits" : danger?”
  1. AghilesApr 8, 2010
  2. Michael J GruberApr 8, 2010
  3. AghilesApr 8, 2010
  4. Jonathan NiederApr 8, 2010
  5. AghilesApr 8, 2010
  6. Junio C HamanoApr 8, 2010
  7. AghilesApr 8, 2010

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.