os/CONTRIBUTING.md
Benjamin Bädorf 3c3abec238
fix: move pre-commit treefmt hook into CI
The logic inside the hook was rather broken, causing confusing merges,
stashes, and aborts. Unfortunately `treefmt` does not provide a pure
lint option that checks without writing the changes. So instead, we do
this in CI.
2023-07-13 17:05:27 +02:00

1.4 KiB

Quick branch overview

We work with several branches in this repo. This document aims to explain how to contribute changes to the existing branches.

main branch

  • Changes to modules and profiles should go the main branch
  • Changes can get accepted via: Pull Request
  • Branch protected from direct git push

infra branch

  • Changes to the pub.solar infrastructure should be merged into this branch
  • Changes can get accepted via: Pull Request
  • Branch protected from direct git push

momo/main branch

$USER branches

  • User's custom hosts and changes can be worked on in these branches
  • Direct git push possible
  • Examples: