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 20:02:02 +0300 [thread overview]
Message-ID: <83siagws8l.fsf@gnu.org> (raw)
In-Reply-To: <CAAdUY-JfMcbCVhSW5n3PuT7oXDfeopnX=vN3x12XhJd0fXMFLw@mail.gmail.com>
> Date: Thu, 28 May 2015 17:24:30 +0100
> From: Artur Malabarba <bruce.connor.am@gmail.com>
> Cc: Michael Albinus <michael.albinus@gmx.de>, emacs-devel <emacs-devel@gnu.org>
> Yes, that was the point. If I wrote a commit to fix something that's already
> fixed, that commit is now useless, so I discard it.
This is a singular situation that happens very rarely, so it's really
more of exception than the rule.
Learning to deal with merge conflicts, OTOH, will teach the user to
cope with a much broader class of problems.
> 1. Reverting a commit only affects code I've just written, so it takes very
> little mental energy. I know what I'm changing with 100% certainty.
> 2. Resolving a merge conflict involves both mine and someone else's code, so
> I'll need to invest some energy to read and interpret that code (might be a
> little or a lot, depending on the code).
If you got a conflict, it means you've modified the same areas as that
someone, so presumably you know enough about that code to deal with
the conflict.
> 3. Even after I've read and interpreted the new remote code, there's always a
> small chance I miss some tiny detail inside a large diff when resolving the
> conflict. (I've introduced bugs this way a couple of times, whereas I've never
> introduced a bug while reverting).
Talking with the persons involved is allowed. Git doesn't make us
speechless.
> 4. Even when the conflict is simple and I know I can solve it without risk,
> doing the merge will still keep redundant commits in the history. It's not a
> huge deal, but there's no reason to have two commits doing the exact same
> thing.
Yes, there is a reason: use a routine procedure as frequently as it
fits the bill, and you will become fluent with it and stop being
scared.
next prev parent reply other threads:[~2015-05-28 17:02 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 [this message]
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=83siagws8l.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.