Introduce script to automatically resolve conflicts after treewide changes (such as reformats)#363759

dasJ merged 1 commit intoNixOS:masterNixOS/nixpkgs:masterfrom

tweag:format-rebasetweag/nixpkgs:format-rebaseCopy head branch name to clipboard