sid/nix-config
1
0
Fork 0
Code Issues Pull requests 2 Projects Releases Packages Wiki Activity Actions

16ach6: fde and cleanup #3

Open
sid wants to merge 1 commit from fde into master
pull from: fde
merge into: sid:master
Conversation 0 Commits 1 Files changed 18 +459 -276
sid commented 2026-07-30 23:36:58 +02:00
Owner
Copy link
No description provided.
This pull request has changes conflicting with the target branch.
  • flake.lock
  • flake.nix
  • hosts/16ach6/default.nix
  • users/sid/home/hosts/16ach6/default.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 fde:fde
git switch fde

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 master
git merge --no-ff fde
git switch fde
git rebase master
git switch master
git merge --ff-only fde
git switch fde
git rebase master
git switch master
git merge --no-ff fde
git switch master
git merge --squash fde
git switch master
git merge --ff-only fde
git switch master
git merge fde
git push origin master
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No labels
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
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.

Dependencies

No dependencies set.

Reference
sid/nix-config!3
No description provided.