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

storage-refactor #9

Open
jan-leila wants to merge 38 commits from storage-refactor into main
pull from: storage-refactor
merge into: jan-leila:main
Conversation 0 Commits 38 Files changed 118 +1665 -1369
jan-leila commented 2025-11-10 22:20:56 +00:00
Owner
Copy link
No description provided.
jan-leila added 26 commits 2025-11-10 22:20:57 +00:00
jan-leila added 2 commits 2025-11-15 04:07:05 +00:00
jan-leila added 1 commit 2025-11-15 20:03:44 +00:00
jan-leila added 1 commit 2025-11-15 22:37:27 +00:00
jan-leila added 1 commit 2025-11-16 06:04:28 +00:00
jan-leila added 2 commits 2025-11-16 06:13:13 +00:00
jan-leila added 1 commit 2025-11-18 00:08:59 +00:00
jan-leila added 1 commit 2025-11-22 01:25:33 +00:00
jan-leila added 1 commit 2025-11-23 18:11:23 +00:00
jan-leila added 1 commit 2025-11-23 21:35:56 +00:00
jan-leila added 1 commit 2025-11-23 21:45:13 +00:00
This pull request has changes conflicting with the target branch.
  • modules/nixos-modules/ssh.nix
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin storage-refactor:storage-refactor
git checkout storage-refactor

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 checkout main
git merge --no-ff storage-refactor
git checkout storage-refactor
git rebase main
git checkout main
git merge --ff-only storage-refactor
git checkout storage-refactor
git rebase main
git checkout main
git merge --no-ff storage-refactor
git checkout main
git merge --squash storage-refactor
git checkout main
git merge --ff-only storage-refactor
git checkout main
git merge storage-refactor
git push origin main
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: jan-leila/nix-config#9
No description provided.
Delete branch "storage-refactor"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?