WIP: Add my-nix-lib #42

Draft
martin wants to merge 1 commit from my-config into main
Owner
No description provided.
martin self-assigned this 2026-07-25 15:45:37 +00:00
Add my-nix-lib
Some checks failed
ci/woodpecker/pr/pr-review Pipeline was successful
ci/woodpecker/pr/switch Pipeline was canceled
286bd1b5ec
martin force-pushed my-config from 286bd1b5ec
Some checks failed
ci/woodpecker/pr/pr-review Pipeline was successful
ci/woodpecker/pr/switch Pipeline was canceled
to 30f6eaf1a6
All checks were successful
ci/woodpecker/pr/pr-review Pipeline was successful
ci/woodpecker/pr/switch Pipeline was successful
2026-07-25 15:45:47 +00:00
Compare
All checks were successful
ci/woodpecker/pr/pr-review Pipeline was successful
ci/woodpecker/pr/switch Pipeline was successful
This pull request has changes conflicting with the target branch.
  • env/dev/martials.no.nix
  • flake.lock
  • modules/common.nix
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin 'my-config:my-config'
git switch 'my-config'

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch 'main'
git merge --no-ff 'my-config'
git switch 'my-config'
git rebase 'main'
git switch 'main'
git merge --ff-only 'my-config'
git switch 'my-config'
git rebase 'main'
git switch 'main'
git merge --no-ff 'my-config'
git switch 'main'
git merge --squash 'my-config'
git switch 'main'
git merge --ff-only 'my-config'
git switch 'main'
git merge 'my-config'
git push origin 'main'
Sign in to join this conversation.
No reviewers
No milestone
No project
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Reference
Personal/cluster!42
No description provided.