From: Eli Zaretskii <eliz@gnu.org>
To: Alan Mackenzie <acm@muc.de>
Cc: emacs-devel@gnu.org, gscrivano@gnu.org, dgutov@yandex.ru
Subject: Re: Stupid git!
Date: Sun, 13 Sep 2015 09:49:43 +0300 [thread overview]
Message-ID: <83613ebypk.fsf@gnu.org> (raw)
In-Reply-To: <20150912215114.GB3711@acm.fritz.box>
> Date: Sat, 12 Sep 2015 21:51:14 +0000
> Cc: Eli Zaretskii <eliz@gnu.org>, gscrivano@gnu.org, emacs-devel@gnu.org
> From: Alan Mackenzie <acm@muc.de>
>
> > What does 'git status' say?
>
> On branch master
> Your branch and 'origin/master' have diverged,
> and have 1 and 1 different commit each, respectively.
> (use "git pull" to merge the remote branch into yours)
> All conflicts fixed but you are still merging.
> (use "git commit" to conclude merge)
>
> Changes to be committed:
>
> modified: test/automated/file-notify-tests.el
>
> Changes not staged for commit:
> (use "git add <file>..." to update what will be committed)
> (use "git checkout -- <file>..." to discard changes in working
> directory)
>
> modified: .gitignore
> modified: lisp/textmodes/paragraphs.el
> modified: src/search.c
>
>
> > > I think the best thing for me to do now is `git checkout <file>' to
> > > revert that changed file,
>
> > If you're in the middle of a merge, it's a recipe for disaster.
>
> :-). OK, but the immediate problem is that _I_ didn't modify
> file-notify-tests.el. Somebody else did, and git put his changes into
> my working directory and `git add'ed it.
That's what happens when there are merge conflicts: Git suspends the
merge in its middle.
> I don't have the log entry for this change. So am I supposed to
> just commit this, with my own log entry?
Commit everything in one go, with "git commit", and give it a single
log entry, something like "resolve merge conflicts".
> I don't really understand what "you are still merging" is supposed to
> mean. How do I get out of the "merging" state cleanly, without
> commiting somebody else's changes?
You _must_ commit. A successful merge in Git always ends in a commit,
and in this case you need to do it manually, because the automatic
merge failed due to diverging.
next prev parent reply other threads:[~2015-09-13 6:49 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-12 10:15 Stupid git! Alan Mackenzie
2015-09-12 10:21 ` Alan Mackenzie
2015-09-12 10:40 ` Dmitry Gutov
2015-09-12 12:29 ` Alan Mackenzie
2015-09-12 12:34 ` David Kastrup
2015-09-12 12:59 ` Alan Mackenzie
2015-09-12 20:14 ` Dmitry Gutov
2015-09-14 10:09 ` Steinar Bang
2015-09-12 20:37 ` Stefan Monnier
2015-09-12 10:40 ` David Kastrup
2015-09-12 10:53 ` Dmitry Gutov
2015-09-12 12:52 ` Alan Mackenzie
2015-09-12 11:45 ` Giuseppe Scrivano
2015-09-12 13:02 ` Alan Mackenzie
2015-09-12 14:12 ` Andreas Schwab
2015-09-12 15:16 ` Eli Zaretskii
2015-09-12 20:36 ` Alan Mackenzie
2015-09-12 20:43 ` Dmitry Gutov
2015-09-12 21:51 ` Alan Mackenzie
2015-09-13 6:22 ` Sven Axelsson
2015-09-14 10:21 ` Alan Mackenzie
2015-09-14 10:29 ` David Kastrup
2015-09-14 12:19 ` Eli Zaretskii
2015-09-14 12:28 ` David Kastrup
2015-09-14 12:37 ` Eli Zaretskii
2015-09-14 12:47 ` David Kastrup
2015-09-14 13:38 ` Eli Zaretskii
2015-09-14 13:44 ` David Kastrup
2015-09-14 12:38 ` Stefan Monnier
2015-09-13 6:49 ` Eli Zaretskii [this message]
2015-09-14 10:49 ` Alan Mackenzie
2015-09-15 0:24 ` Stephen J. Turnbull
2015-09-13 20:28 ` Dmitry Gutov
2015-09-14 3:11 ` Stephen J. Turnbull
2015-09-14 13:47 ` Dmitry Gutov
2015-09-14 11:09 ` Alan Mackenzie
2015-09-14 12:22 ` Eli Zaretskii
2015-09-14 13:42 ` Dmitry Gutov
2015-09-14 17:05 ` Steinar Bang
2015-09-14 10:37 ` Steinar Bang
2015-09-13 6:42 ` Eli Zaretskii
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=83613ebypk.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=acm@muc.de \
--cc=dgutov@yandex.ru \
--cc=emacs-devel@gnu.org \
--cc=gscrivano@gnu.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.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
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.