Same for me, starting resolving rebase conflict.
Hi Guixers,
I would recommend cherry picking logical commits into new branches that can be quickly reviewed and merged by Guix volunteers.
Steve made a list here of some logical commits that can go into new branches:
Feel free to send small patch sets of those for review by Guix volunteers to look at.
I can take some time to review and apply such small patches and test them.
all the best,
jgart