From: Eli Zaretskii <eliz@gnu.org>
To: rms@gnu.org
Cc: rpluim@gmail.com, emacs-devel@gnu.org
Subject: Re: master 47070ed 6/6: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Date: Thu, 13 May 2021 09:38:27 +0300 [thread overview]
Message-ID: <83v97n16l8.fsf@gnu.org> (raw)
In-Reply-To: <E1lh3Lw-0004gy-OP@fencepost.gnu.org> (message from Richard Stallman on Thu, 13 May 2021 00:53:40 -0400)
> From: Richard Stallman <rms@gnu.org>
> Cc: rpluim@gmail.com, emacs-devel@gnu.org
> Date: Thu, 13 May 2021 00:53:40 -0400
>
> > > Richard> Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
> > >
> > > Richard> What choice do I have?
>
> > Richard, can you tell what caused you to ask that question?
>
> I did git pull and it said there were conflicts. I resolved the conflicts
> and committed them. Then I did git pull again and it asked me why
> I was doing the merge. I could not think of any reason except that
> git demanded it.
I see nothing wrong with what you did, it's one way of dealing with
local changes when you update from upstream.
> I have never tried rebasing.
I see no reason to start now.
next prev parent reply other threads:[~2021-05-13 6:38 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20210512030946.27770.7288@vcs0.savannah.gnu.org>
[not found] ` <20210512030949.65CD421128@vcs0.savannah.gnu.org>
2021-05-12 8:16 ` master 47070ed 6/6: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs Robert Pluim
2021-05-12 12:50 ` Eli Zaretskii
2021-05-13 4:53 ` Richard Stallman
2021-05-13 6:38 ` Eli Zaretskii [this message]
2021-05-14 5:23 ` Richard Stallman
2021-05-14 7:00 ` Eli Zaretskii
2021-05-14 13:45 ` Stefan Monnier
2021-05-14 14:49 ` Andreas Schwab
2021-05-16 4:37 ` Richard Stallman
[not found] ` <20210512030948.6448F21128@vcs0.savannah.gnu.org>
2021-05-12 12:17 ` master 42596bd 2/6: Little improvements in rmail.el. Recognize encryped override headers Lars Ingebrigtsen
2021-05-12 13:12 ` Eli Zaretskii
2021-05-12 13:16 ` Lars Ingebrigtsen
2021-05-12 13:20 ` Eli Zaretskii
2021-05-12 15:14 ` Stefan Monnier
2021-05-12 15:45 ` Eli Zaretskii
2021-05-12 15:47 ` Lars Ingebrigtsen
2021-05-12 15:59 ` Eli Zaretskii
2021-05-12 15:54 ` Robert Pluim
2021-05-12 14:03 ` Gregory Heytings
2021-05-12 14:17 ` Gregory Heytings
2021-05-13 4:52 ` Richard Stallman
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
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=83v97n16l8.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=rms@gnu.org \
--cc=rpluim@gmail.com \
/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 public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).