Formatting Team Meeting 2025-01-21

[Infinisil]

Team info
All meeting notes
Attendees: Sergey @0x4A6F @infinisil @das_j

Notes

• Introduce script to automatically resolve conflicts after treewide changes (such as reformats) by infinisil · Pull Request #363759 · NixOS/nixpkgs · GitHub
  • Reviewed together and merged
• Appending an optional string / array causes the entire expression to be reformatted · Issue #228 · NixOS/nixfmt · GitHub
  • Discussed and notes posted: Appending an optional string / array causes the entire expression to be reformatted · Issue #228 · NixOS/nixfmt · GitHub
• Improving flake formatting experience · Issue #273 · NixOS/nixfmt · GitHub
  • @infinisil briefly brainstormed a bit

[Sandro]

@Infinisil

Introduce script to automatically resolve conflicts after treewide changes (such as reformats) by infinisil · Pull Request #363759 · NixOS/nixpkgs · GitHub

• Reviewed together and merged

Is there somewhere an example on how to use it?

[Infinisil]

Not yet, but very briefly:

If you have a commit that was automatically generated with a command, you can add

<commit hash> # !autorebase <command>

to .git-blame-ignore-revs.

Then you can use

git fetch upstream
maintainers/scripts/auto-rebase/run.sh upstream/master

just like git rebase upstream/master, to rebase while automatically resolving conflicts from the autorebaseable commits.

I’ll make use of this for the upcoming full treewide reformat.