From: Eli Zaretskii <eliz@gnu.org>
To: bruce.connor.am@gmail.com
Cc: michael.albinus@gmx.de, 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:46:15 +0300 [thread overview]
Message-ID: <838uc8yd3c.fsf@gnu.org> (raw)
In-Reply-To: <CAAdUY-L_FPxB9mS=Z859JTN840_yfQstfDT4utK4bKPBq5JTCw@mail.gmail.com>
> Date: Thu, 28 May 2015 10:27:15 +0100
> From: Artur Malabarba <bruce.connor.am@gmail.com>
> Cc: emacs-devel <emacs-devel@gnu.org>
>
> As a general tip. Next time you try to pull and find out someone
> already has already done what you just did, don't resolve the merge
> conflict. Instead, abort the merge with `git merge --abort` (this will
> get you back to the state you had right before the pull), and then
> locally revert your commit.
I don't see how this advice will be able to keep Michael out of
trouble next time. AFAICT, it will just get him in a different
situation, one that isn't simpler or safer to deal with. Locally
reverting commits risks losing them, for example.
OTOH, merge conflicts are nothing to be afraid of, the procedure to
handle them is simple and straightforward. Michael (and every one
else here) should IMO master that simple procedure, instead of
avoiding it.
In a dVCS, you cannot rely on being able to avoid merges all the time
anyway. There are always races with other developers.
next prev parent reply other threads:[~2015-05-28 14:46 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 [this message]
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=838uc8yd3c.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=bruce.connor.am@gmail.com \
--cc=emacs-devel@gnu.org \
--cc=michael.albinus@gmx.de \
/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.