All of lore.kernel.org
 help / color / mirror / Atom feed
From: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
To: cvalusek <clintv2@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: GIT pull
Date: Thu, 12 Apr 2012 17:03:58 +0200	[thread overview]
Message-ID: <vpqiph5m1pd.fsf@bauges.imag.fr> (raw)
In-Reply-To: <1334242077960-7459655.post@n2.nabble.com> (cvalusek's message of "Thu, 12 Apr 2012 07:47:57 -0700 (PDT)")

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/

  reply	other threads:[~2012-04-12 15:04 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-04-12 14:47 GIT pull cvalusek
2012-04-12 15:03 ` Matthieu Moy [this message]
2012-04-12 15:07   ` Michael Witten
2012-04-12 16:58 ` Johannes Sixt
2012-04-12 17:29 ` cvalusek
  -- strict thread matches above, loose matches on Subject: below --
2017-11-13 23:11 git pull Tobin C. Harding
2017-11-14 11:05 ` Greg Kroah-Hartman
2017-11-14 11:05   ` Greg Kroah-Hartman
2017-11-14 12:00   ` Ulf Hansson
2017-11-14 12:00     ` Ulf Hansson
2017-11-14 12:09     ` Greg Kroah-Hartman
2017-11-14 12:09       ` Greg Kroah-Hartman
2017-11-14 18:04   ` Linus Torvalds
2017-11-14 18:04     ` Linus Torvalds
2017-11-14 21:33   ` Tobin C. Harding
2017-11-14 21:33     ` Tobin C. Harding
2017-11-14 21:46     ` Linus Torvalds
2017-11-14 21:46       ` Linus Torvalds
2017-11-15 10:51       ` Michael Ellerman
2017-11-15 10:51         ` Michael Ellerman
2017-11-16 20:36       ` Linus Torvalds
2017-11-16 20:36         ` Linus Torvalds
2017-11-20  5:37         ` Junio C Hamano
2017-11-20  6:04           ` Linus Torvalds
2017-11-14 21:42   ` Tobin C. Harding
2017-11-14 21:42     ` Tobin C. Harding
2010-05-17 21:51 matteo brutti
2010-05-18 16:31 ` Nicolas Sebrecht
2010-05-19 11:03 ` hasen j
2010-01-19  8:01 robin
2010-01-19  8:09 ` robin
2010-01-19 18:37   ` Paul Wilson
2010-01-23  7:22     ` Khem Raj
2010-01-19 20:13   ` Bjørn Forsman

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=vpqiph5m1pd.fsf@bauges.imag.fr \
    --to=matthieu.moy@grenoble-inp.fr \
    --cc=clintv2@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.