From: Andreas Enge <andreas@enge.fr>
To: Leo Famulari <leo@famulari.name>
Cc: guix-devel@gnu.org
Subject: Re: Qt in core-updates
Date: Wed, 1 Mar 2023 00:54:04 +0100 [thread overview]
Message-ID: <Y/6UHDR+BktyoFc/@jurong> (raw)
In-Reply-To: <Y/5qQDW9QZZBKqRC@jurong>
Am Tue, Feb 28, 2023 at 09:55:28PM +0100 schrieb Andreas Enge:
> Am Tue, Feb 28, 2023 at 09:51:49PM +0100 schrieb Andreas Enge:
> > Maybe it is time to merge master back into core-updates?
> Where the vague "it is time to" could be read as "could you please?".
> It is something I have never done, so it makes me nervous. Well, I suppose
> I could just merge and try to fix the merge conflicts?
Well, I gave it a try, and it seems to be okay. So far I pushed it as a
separate branch, wip-andreas-merge. It does compile. If you agree, I
could also push it to core-updates (assuming that merge commits can be
pushed just like every other commit; I am a bit doubtful what happens if
someone else pushes other commits in the meantime; probably then I will
have to merge a second time, to core-updates, instead of just pushing
there?).
Andreas
next prev parent reply other threads:[~2023-02-28 23:54 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-20 13:59 KDE in core-updates Andreas Enge
2023-02-24 10:34 ` Andreas Enge
2023-02-25 18:19 ` Ludovic Courtès
2023-02-26 12:44 ` Qt in core-updates (was: KDE in core-updates) Andreas Enge
2023-02-26 23:43 ` Philip McGrath
2023-02-27 2:38 ` kiasoc5
2023-02-27 19:02 ` Efraim Flashner
2023-02-28 15:13 ` Andreas Enge
2023-02-28 17:59 ` Qt in core-updates Andreas Enge
2023-02-28 18:09 ` Andreas Enge
2023-02-28 18:20 ` Leo Famulari
2023-02-28 20:51 ` Andreas Enge
2023-02-28 20:55 ` Andreas Enge
2023-02-28 23:54 ` Andreas Enge [this message]
2023-03-01 0:05 ` Andreas Enge
2023-03-15 13:53 ` KDE " Andreas Enge
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=Y/6UHDR+BktyoFc/@jurong \
--to=andreas@enge.fr \
--cc=guix-devel@gnu.org \
--cc=leo@famulari.name \
/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).