Daholli/nixos-config
1
0
Fork 0
Code Issues 3 Pull requests 1 Releases Packages Activity Actions

merge flake-parts rewrite into main #19

Open
Daholli wants to merge 6 commits from main-merge into main
pull from: main-merge
merge into: Daholli:main
Conversation 0 Commits 6 Files changed 143 +3513 -6761
Daholli commented 2025-10-28 10:13:03 +01:00
Owner
Copy link
No description provided.
Daholli added 6 commits 2025-10-28 10:13:04 +01:00
Daholli changed title from main-merge to merge flake-parts rewrite into main 2025-10-28 10:14:48 +01:00
This pull request has changes conflicting with the target branch.
  • flake.lock
View command line instructions

Checkout

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

Merge

Merge the changes and update on Forgejo.
git checkout main
git merge --no-ff main-merge
git checkout main-merge
git rebase main
git checkout main
git merge --ff-only main-merge
git checkout main-merge
git rebase main
git checkout main
git merge --no-ff main-merge
git checkout main
git merge --squash main-merge
git checkout main
git merge --ff-only main-merge
git checkout main
git merge main-merge
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: Daholli/nixos-config#19
No description provided.
Delete branch "main-merge"

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?