From: Marius Bakke <marius@gnu.org>
To: Pierre Neidhardt <mail@ambrevar.xyz>
Cc: guix-devel@gnu.org
Subject: Re: branch master updated: gnu: nyxt: Update to 2-pre-release-3.
Date: Sat, 07 Nov 2020 20:46:08 +0100 [thread overview]
Message-ID: <87d00pgdbz.fsf@gnu.org> (raw)
In-Reply-To: <87ft5lgdmn.fsf@gnu.org>
[-- Attachment #1: Type: text/plain, Size: 727 bytes --]
Marius Bakke <marius@gnu.org> writes:
> This is a friendly reminder to please list all changes to inputs,
> arguments etc in the commit message. It makes resolving merge conflicts
> *much* easier.
>
> Due to SBCL changes on the 'staging' branch, there have been a few
> changes to the 'nyxt' inputs; and because the changes from 'master' are
> not mentioned in the commit messages, I need to manually look at each
> commit and note what has changed in order to resolve the conflict.
>
> (feel free to try merging c2396ceb onto 052939c2 to get an idea of what
> I'm talking about :-)
If you happen to be around right now, can you confirm that there were no
changes to nyxt inputs in 573489fbcd68e3a89cc5c9c66693d3689b1b88bf?
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 507 bytes --]
next prev parent reply other threads:[~2020-11-07 19:46 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20201020130843.10939.42161@vcs0.savannah.gnu.org>
2020-11-07 19:39 ` branch master updated: gnu: nyxt: Update to 2-pre-release-3 Marius Bakke
2020-11-07 19:46 ` Marius Bakke [this message]
2020-11-08 9:40 ` Pierre Neidhardt
2020-11-08 15:16 ` Marius Bakke
2020-11-09 7:12 ` zimoun
2020-11-09 9:29 ` Pierre Neidhardt
2020-11-09 21:14 ` Marius Bakke
2020-11-09 22:38 ` Marius Bakke
2020-11-10 9:01 ` Pierre Neidhardt
2020-11-10 9:28 ` Pierre Neidhardt
2020-11-10 19:22 ` Marius Bakke
2020-11-10 19:59 ` Pierre Neidhardt
2020-11-10 20:28 ` Marius Bakke
2020-11-11 9:19 ` Pierre Neidhardt
2020-11-11 12:43 ` Pierre Neidhardt
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://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87d00pgdbz.fsf@gnu.org \
--to=marius@gnu.org \
--cc=guix-devel@gnu.org \
--cc=mail@ambrevar.xyz \
/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/guix.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).