How to resolve formatting related conflicts #13502
Description
With #13108 there will be a lot of conflicts for existing open PRs.
The easiest way to resolve them is with the auto-rebase script from nixpkgs. This is the same tool that has been used for the treewide reformat of nixpkgs (see NixOS/nixpkgs#395247).
nix develop github:NixOS/nix # Enter the devshell from master branch
curl https://raw.githubusercontent.com/NixOS/nixpkgs/refs/heads/master/maintainers/scripts/auto-rebase/run.sh | bash -s -- upstream/master
Alternatively you can use the auto-rebase script from your local nixpkgs checkout.