Marius Bakke <mar...@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.
signature.asc
Description: PGP signature
