From: Michael Albinus <michael.albinus@gmx.de>
To: Stefan Monnier <monnier@iro.umontreal.ca>
Cc: 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 10:13:49 +0200 [thread overview]
Message-ID: <87egm13yrm.fsf@gmx.de> (raw)
In-Reply-To: <jwv8uc9s9zw.fsf-monnier+emacsdiffs@gnu.org> (Stefan Monnier's message of "Wed, 27 May 2015 22:40:41 -0400")
Stefan Monnier <monnier@iro.umontreal.ca> writes:
>> branch: master
>> commit f9fabb2bb099d944cc97a87933b86b9eae02d067
>> Merge: 570edf2 b0f3a49
>> Author: Michael Albinus <michael.albinus@gmx.de>
>> Commit: Michael Albinus <michael.albinus@gmx.de>
>
>> Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
>
> What happened, here?
>
> git diff 570edf2..f9fabb2bb099d944cc97a87933b86b9eae02d067
>
> is empty (i.e. the "merge" just threw away all the changes from
> b0f3a49, i.e. from "master"). And indeed:
>
> git diff b0f3a49..f9fabb2bb099d944cc97a87933b86b9eae02d067
>
> shows that you reverted a bunch of the recent commits
> applied to "master". How did this happen?
Oh shit. Something like this:
- I've seen the messages in emacs-devel that I did an error syncing
tramp.el from the Tramp repository. Panic.
- I've fixed this in the local Emacs repository, and committed it.
- I've tried to push tramp.el, which failed (due to further commits in
the remote Emacs repository).
- I've pulled from the remote Emacs repository, getting a conflict in
tramp.el. Glenn had fixed the problem already, but there are
whitespace difference between his and my change.
- I've fixed the conflict in tramp.el, and committed it.
- I've tried to push, but I was said that it's not possible because the
previous merge wasn't finished.
- ERROR: I've reverted all open changes in my Emacs repository.
- I've pushed.
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 :-(
Conclusion: I will try to implement a local pull-before-and-push-after
commit policy. This shall minimize merge conflicts.
I am very sorry that I have brought to you additional work, again.
> Stefan
Best regards, Michael.
next prev parent reply other threads:[~2015-05-28 8:13 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 [this message]
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
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=87egm13yrm.fsf@gmx.de \
--to=michael.albinus@gmx.de \
--cc=emacs-devel@gnu.org \
--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.