From: Eli Zaretskii <eliz@gnu.org>
To: Michael Albinus <michael.albinus@gmx.de>
Cc: monnier@iro.umontreal.ca, emacs-devel@gnu.org
Subject: Re: [Emacs-diffs] master f9fabb2 2/2: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Date: Thu, 28 May 2015 17:40:45 +0300 [thread overview]
Message-ID: <83bnh4ydci.fsf@gnu.org> (raw)
In-Reply-To: <87egm13yrm.fsf@gmx.de>
> From: Michael Albinus <michael.albinus@gmx.de>
> Date: Thu, 28 May 2015 10:13:49 +0200
> Cc: emacs-devel@gnu.org
>
> - I've tried to push, but I was said that it's not possible because the
> previous merge wasn't finished.
You should have finished it (whatever that means; you didn't show
enough info about that to tell what else needed to be done).
> - ERROR: I've reverted all open changes in my Emacs repository.
>
> - I've pushed.
Not sure how it is possible, nor what "all open changes in my
repository" means here. I think it's important to analyze and
understand what happened, in order for you to make sure you don't make
such mistakes in the future.
> I must claim, that I'm still in fight with git. After a merge conflict,
> it let's *other* items edited I have never touched, and I often don't
> know what to do :-(
What exactly do you mean by "it let's *other* items edited I have
never touched"? Can you show an example?
next prev parent reply other threads:[~2015-05-28 14:40 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20150527165006.32357.80915@vcs.savannah.gnu.org>
[not found] ` <E1YxeWz-0008TK-TD@vcs.savannah.gnu.org>
2015-05-28 2:40 ` [Emacs-diffs] master f9fabb2 2/2: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs Stefan Monnier
2015-05-28 8:13 ` Michael Albinus
2015-05-28 9:27 ` Artur Malabarba
2015-05-28 10:05 ` Michael Albinus
2015-05-28 10:16 ` Andreas Schwab
2015-05-28 10:26 ` Michael Albinus
2015-05-28 16:55 ` Stefan Monnier
2015-05-28 14:46 ` Eli Zaretskii
2015-05-28 15:05 ` Michael Albinus
2015-05-28 15:26 ` Eli Zaretskii
2015-05-28 15:44 ` Phillip Lord
2015-05-28 16:24 ` Artur Malabarba
2015-05-28 17:02 ` Eli Zaretskii
2015-05-28 14:40 ` Eli Zaretskii [this message]
2015-05-28 15:00 ` Michael Albinus
2015-05-28 15:19 ` Eli Zaretskii
2015-05-28 15:52 ` Michael Albinus
2015-05-28 15:56 ` Dmitry Gutov
2015-05-28 16:52 ` Eli Zaretskii
2015-05-28 15:49 ` Andreas Schwab
2015-05-28 19:02 ` Stefan Monnier
2015-05-29 2:20 ` Yuri Khan
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=83bnh4ydci.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=michael.albinus@gmx.de \
--cc=monnier@iro.umontreal.ca \
/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.