* Re: master 00c9308 4/5: ; Merge from origin/emacs-27 [not found] ` <20191230171239.6A12121381@vcs0.savannah.gnu.org> @ 2019-12-30 17:33 ` Glenn Morris 2019-12-30 17:57 ` Michael Albinus 0 siblings, 1 reply; 3+ messages in thread From: Glenn Morris @ 2019-12-30 17:33 UTC (permalink / raw) To: emacs-devel; +Cc: Michael Albinus > branch: master > commit 00c9308ae86dbc2ace7e0154586be84f17036a2b > Merge: 99cd8ba d6922db > The following commit was skipped: > > d6922db49d Sync with Tramp 2.4.3 I think this skip was probably bogus? If so, please could you merge it by hand? Thanks. ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: master 00c9308 4/5: ; Merge from origin/emacs-27 2019-12-30 17:33 ` master 00c9308 4/5: ; Merge from origin/emacs-27 Glenn Morris @ 2019-12-30 17:57 ` Michael Albinus 2019-12-30 18:07 ` Glenn Morris 0 siblings, 1 reply; 3+ messages in thread From: Michael Albinus @ 2019-12-30 17:57 UTC (permalink / raw) To: Glenn Morris; +Cc: emacs-devel Glenn Morris <rgm@gnu.org> writes: Hi Glenn, >> branch: master >> commit 00c9308ae86dbc2ace7e0154586be84f17036a2b >> Merge: 99cd8ba d6922db > >> The following commit was skipped: >> >> d6922db49d Sync with Tramp 2.4.3 > > I think this skip was probably bogus? Yes, it was intended also for master. Do you see why it was skipped? > If so, please could you merge it by hand? Thanks. Done. Best regards, Michael. ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: master 00c9308 4/5: ; Merge from origin/emacs-27 2019-12-30 17:57 ` Michael Albinus @ 2019-12-30 18:07 ` Glenn Morris 0 siblings, 0 replies; 3+ messages in thread From: Glenn Morris @ 2019-12-30 18:07 UTC (permalink / raw) To: Michael Albinus; +Cc: emacs-devel Michael Albinus wrote: > Do you see why it was skipped? Probably because the log message contained "bump version", which has always (until today) been in gitmerge-skip-regexp. ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-12-30 18:07 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20191230171235.15540.85701@vcs0.savannah.gnu.org>
[not found] ` <20191230171239.6A12121381@vcs0.savannah.gnu.org>
2019-12-30 17:33 ` master 00c9308 4/5: ; Merge from origin/emacs-27 Glenn Morris
2019-12-30 17:57 ` Michael Albinus
2019-12-30 18:07 ` Glenn Morris
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).