foxora/nix
2
3
Fork 1
Code Issues Pull requests 2 Projects Releases Packages Wiki Activity Actions

migrate to experimental snow.flake schema #4

Open
cry wants to merge 2 commits from cry/flake-foxora:bleeding into main
pull from: cry/flake-foxora:bleeding
merge into: foxora:main
Conversation 1 Commits 2 Files changed 6 +60 -70
cry commented 2026-02-21 16:27:00 +10:00
Contributor
Copy link

please don't merge this, it's just so i can track changes :3
🩷💜

please don't merge this, it's just so i can track changes :3 🩷💜
foxora commented 2026-02-28 16:50:45 +10:00
Owner
Copy link

this looks to be what i did eventually with my config, right?

this looks to be what i did eventually with my config, right?
cry force-pushed bleeding from fbafcca488 to d512a54074 2026-03-08 03:11:37 +10:00 Compare
This pull request has changes conflicting with the target branch.
  • flake.lock
  • flake.nix
  • snow.nix
View command line instructions

Checkout

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

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 cry-bleeding
git checkout cry-bleeding
git rebase main
git checkout main
git merge --ff-only cry-bleeding
git checkout cry-bleeding
git rebase main
git checkout main
git merge --no-ff cry-bleeding
git checkout main
git merge --squash cry-bleeding
git checkout main
git merge --ff-only cry-bleeding
git checkout main
git merge cry-bleeding
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
2 participants
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: foxora/nix#4
No description provided.
Delete branch "cry/flake-foxora:bleeding"

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?