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/
next prev parent reply other threads:[~2012-04-12 15:04 UTC|newest]
Thread overview: 10+ 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
[not found] <20171113231155.GA26779@eros>
[not found] ` <20171114110500.GA21175@kroah.com>
[not found] ` <20171114213320.GB905@eros>
[not found] ` <CA+55aFyMxkS=8JzZ+ROOAFkwR45EKBnQ0GUMQS4f+r_-fFWiEA@mail.gmail.com>
[not found] ` <CA+55aFzhK+GPO1_Zm2PoQiq5-cHAq6nz1ejrBhGhWX-KAjTU9A@mail.gmail.com>
2017-11-20 5:37 ` git pull Junio C Hamano
2017-11-20 6:04 ` Linus Torvalds
-- strict thread matches above, loose matches on Subject: below --
2010-05-17 21:51 matteo brutti
2010-05-18 16:31 ` Nicolas Sebrecht
2010-05-19 11:03 ` hasen j
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$(echo .)fr \
--cc=clintv2@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox