From: Marius Bakke <marius@gnu.org>
To: guix-devel@gnu.org
Subject: Re: Heads-up: hard reset of the 'staging' branch
Date: Mon, 25 May 2020 21:50:25 +0200 [thread overview]
Message-ID: <87d06r7q0u.fsf@gnu.org> (raw)
In-Reply-To: <87ftbn7r7r.fsf@gnu.org>
[-- Attachment #1: Type: text/plain, Size: 1255 bytes --]
Marius Bakke <marius@gnu.org> writes:
> I have pushed a 'staging2' branch where I did the following:
>
> 1) git rebase -i --rebase-merges 8229ce3116c1f522c7157ab2dcd50dc2d765686a~
>
> 2) Moved 8229ce3116c1f522c7157ab2dcd50dc2d765686a after
> f00270d35a6ca814903a9392caedc29d44959088 (the first merge that includes
> .guix-authorizations) -- it was "one step down" in Magits interactive
> rebase menu.
>
> 3) "solved" three merge conflicts (actually git rerere remembered the
> resolutions, and I could have used git rebase --rerere-autoupdate to
> make the process entirely automatic).
>
> I intend to move the current 'staging' branch to 'staging-old', and
> rename 'staging2' to 'staging' once I'm fully confident in the result
> and resolution.
Of course I sent this before actually testing the branch! 'git rerere'
had forgotten a very important merge resolution from
354880e7209a2aec0360dfe5b08b1873c084e2dd: the "tzdata-for-tests" package
needs to be kept on version 2019c during that merge to prevent a
full rebuild via "python".
I will do a new rebase tomorrow and make sure each of the merges are
correct.
Meanwhile, do not pull 'staging2' unless you are freezing and the
computer is your main heat source.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]
next prev parent reply other threads:[~2020-05-25 19:50 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-25 19:24 Heads-up: hard reset of the 'staging' branch Marius Bakke
2020-05-25 19:50 ` Marius Bakke [this message]
2020-05-26 21:57 ` Marius Bakke
2020-05-29 16:54 ` Ludovic Courtès
2020-05-29 18:18 ` Marius Bakke
2020-06-04 11:53 ` Ludovic Courtès
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=87d06r7q0u.fsf@gnu.org \
--to=marius@gnu.org \
--cc=guix-devel@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/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).