How do I update the kde-wayland branch to master?

Help
1

I want to run the plasma5 nixos test from the kde-wayland branch
I does hang if I run it from said branch, but if I run it from master it does run and work as ussual.
How do I update the kde-wayland branch to master, so that I can put said changes while benefitting from a working test case?
I’ve already tried both git merge master and git rebase master
but bot give me thousand of conflicts as the branch is too old.

2

You will either need to resolve the conflicts or re-create the changes. Other options like trying to reconcile the two branches in Nix will be even more complicated.