phoenix/nixos-configuration
1
0
Fork 0
Code Issues Pull requests 3 Packages Projects Releases Wiki Activity

Migrate to Flakes & Home Manager #1

Open
phoenix wants to merge 0 commits from flakes into main
pull from: flakes
merge into: phoenix:main
Conversation 0 Commits - Files changed -
phoenix commented 2023-06-26 02:26:43 +00:00
Owner
Copy link

"Seems like a fun thing to spend a few hours on," she said, digging deeper.

"Seems like a fun thing to spend a few hours on," she said, digging deeper.
phoenix added 15 commits 2023-06-26 02:26:44 +00:00
phoenix added 1 commit 2023-06-26 02:34:28 +00:00
phoenix added 1 commit 2023-06-26 02:45:54 +00:00
phoenix added 1 commit 2023-06-26 22:29:39 +00:00
This branch is already included in the target branch. There is nothing to merge.
View command line instructions.

Checkout

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

Merge

Merge the changes and update on Forgejo.
git checkout main
git merge --no-ff flakes
git checkout main
git merge --ff-only flakes
git checkout flakes
git rebase main
git checkout main
git merge --no-ff flakes
git checkout main
git merge --squash flakes
git checkout main
git merge --ff-only flakes
git checkout main
git merge flakes
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
bug

Something is not working

  
duplicate

This issue or pull request already exists

  
enhancement

New feature

  
help wanted

Need some help

  
invalid

Something is wrong

  
question

More information is needed

  
wontfix

This won't be fixed

No labels
bug
duplicate
enhancement
help wanted
invalid
question
wontfix
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: phoenix/nixos-configuration#1
No description provided.
Delete branch "flakes"

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?