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

Re: GIT pull

From
Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date
Apr 12, 2012, 15:03 UTC
Message-ID
<vpqiph5m1pd.fsf@bauges.imag.fr>
In-Reply-To
<1334242077960-7459655.post@n2.nabble.com>
cvalusek <clintv2@gmail.com> writes:
> If a user has local modifications not on the index and does a pull, I have
> seen git attempt to start applying the merge to master and abort. The whole
> checkout is then left in a terrible state that is nearly
> unrecoverable.
What do you mean by "terrible state"? What does "git status" say?
> In the past, I thought GIT would run some sort of check to identify
> these problems before it attempts the merge.

Git does check uncommited changes before merging. It allows the merge if the changes touch different files (i.e. if the merge is guaranteed not to touch the same files as the one for which you have uncommited changes).

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/
Previous: cvalusekNext: Michael Witten
Message 2 of 5 in “GIT pull”
  1. cvalusekApr 12, 2012
  2. Matthieu MoyApr 12, 2012
  3. Michael WittenApr 12, 2012
  4. Johannes SixtApr 12, 2012
  5. cvalusekApr 12, 2012

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.