Introduce script to automatically resolve conflicts after treewide changes (such as reformats)#363759
Merged
dasJ merged 1 commit intoNixOS:masterfrom Jan 21, 2025
Merged
Introduce script to automatically resolve conflicts after treewide changes (such as reformats)#363759dasJ merged 1 commit intoNixOS:masterfrom
dasJ merged 1 commit intoNixOS:masterfrom
Conversation
github-actions
bot
added
10.rebuild-darwin: 0
infinisil
commented
Dec 10, 2024
|
This pull request has been mentioned on NixOS Discourse. There might be relevant details there: https://discourse.nixos.org/t/nix-formatting-team-treewide-nixpkgs-formatting/56666/12 |
8 tasks
infinisil
force-pushed
the
format-rebase
branch
2 times, most recently
from
75b199f to
df672c9
Compare
infinisil
changed the title
infinisil
force-pushed
the
format-rebase
branch
2 times, most recently
from
1c0b08f to
6ef1bde
Compare
13 tasks
infinisil
force-pushed
the
format-rebase
branch
from
6ef1bde to
b0cfc97
Compare
Member
Author
|
Reviewed together in the Nix formatting team meeting with @0x4A6F, @dasJ and @Sereja313. |
dasJ
approved these changes
Jan 21, 2025
|
This pull request has been mentioned on NixOS Discourse. There might be relevant details there: https://discourse.nixos.org/t/formatting-team-meeting-2025-01-21/59183/1 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Motivated by NixOS/nixfmt#159 and the treewide Nixpkgs reformatting.
Ping @NixOS/nix-formatting
Things done
This work is funded by Tweag and Antithesis ✨
Add a 👍 reaction to pull requests you find important.