From: Michael Albinus <michael.albinus@gmx.de>
To: Glenn Morris <rgm@gnu.org>
Cc: emacs-devel@gnu.org
Subject: Re: Merge conflicts
Date: Mon, 31 Aug 2020 19:28:53 +0200 [thread overview]
Message-ID: <87r1rm4td6.fsf@gmx.de> (raw)
In-Reply-To: <7timcyzqcl.fsf@fencepost.gnu.org> (Glenn Morris's message of "Mon, 31 Aug 2020 13:18:18 -0400")
Glenn Morris <rgm@gnu.org> writes:
> Hi,
Hi Glenn,
> Automatic merge of emacs-27 to master failed with numerous tramp conflicts.
> Please could you resolve these? TIA.
>
> both modified: doc/misc/tramp.texi
> both modified: doc/misc/trampver.texi
> both modified: lisp/net/tramp-adb.el
> both modified: lisp/net/tramp-gvfs.el
> both modified: lisp/net/tramp-rclone.el
> both modified: lisp/net/tramp-sh.el
> both modified: lisp/net/tramp-smb.el
> both modified: lisp/net/tramp-sudoedit.el
> both modified: lisp/net/tramp.el
> both modified: lisp/net/trampver.el
> both modified: test/lisp/net/tramp-tests.el
These shouldn't have been merged. Unfortunately, I forgot to mark this
in the commit message. Therefore, I've tried a merge on my own
afterwards, hoping that if I skip this commit it will be OK. But I seem
to have failed :-(
Anyway, just skip this. After your merge I will double-check that
everything is OK.
Sorry for the trouble, and best regards, Michael.
next prev parent reply other threads:[~2020-08-31 17:28 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-31 17:18 Merge conflicts Glenn Morris
2020-08-31 17:28 ` Michael Albinus [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-10-04 15:22 Glenn Morris
2021-10-04 15:24 ` Lars Ingebrigtsen
2021-10-04 15:26 ` Stefan Kangas
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=87r1rm4td6.fsf@gmx.de \
--to=michael.albinus@gmx.de \
--cc=emacs-devel@gnu.org \
--cc=rgm@gnu.org \
/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).