Update flake.nix #2

Open

minion wants to merge 2 commits from minion-patch-2 into main

pull from: minion-patch-2

merge into: minion:main

minion:main

minion:minion-patch-4

minion:push-nyyxoktsmuqp

minion:minion-patch-3

minion:minion-patch-1

minion:pages

Conversation 0 Commits 2 Files changed 1 +1 -2

minion commented 2024-07-27 16:33:55 +00:00

Owner

Copy link

No description provided.

minion added 1 commit 2024-07-27 16:33:56 +00:00

Update flake.nix 986f473cdd

minion added 1 commit 2024-07-27 17:56:24 +00:00

Update flake.nix 529157b0d2

Some checks failed

Hide all checks

buildbot/nix-eval Build done.

Details

This pull request has changes conflicting with the target branch.

• flake.nix

View command line instructions.

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u origin minion-patch-2:minion-patch-2

git checkout minion-patch-2

Merge

Merge the changes and update on Forgejo.

git checkout main

git merge --no-ff minion-patch-2

git checkout main

git merge --ff-only minion-patch-2

git checkout minion-patch-2

git rebase main

git checkout main

git merge --no-ff minion-patch-2

git checkout main

git merge --squash minion-patch-2

git checkout main

git merge --ff-only minion-patch-2

git checkout main

git merge minion-patch-2

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

Subscribe

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: minion/docs#2

No description provided.