minion/docs
1
0
Fork 0
forked from auxolotl/docs
Code Pull requests 5 Activity

Update packages/aux-wiki/default.nix #1

Open
minion wants to merge 2 commits from minion-patch-1 into main
pull from: minion-patch-1
merge into: minion:main
Conversation 0 Commits 2 Files changed 2 +3
minion commented 2024-07-27 01:57:49 +00:00
Owner
Copy link
No description provided.
minion added 1 commit 2024-07-27 01:57:50 +00:00
Update packages/aux-wiki/default.nix
Some checks failed
buildbot/nix-eval Build done.
Details
f10c4a4afa
minion added 1 commit 2024-07-27 10:36:41 +00:00
Update flake.nix
All checks were successful
buildbot/nix-build .#checks.x86_64-linux.lix-docs Build done.
Details
buildbot/nix-build .#checks.x86_64-linux.aux-wiki Build done.
Details
buildbot/nix-build .#checks.x86_64-linux.manual-assets Build done.
Details
buildbot/nix-build .#checks.x86_64-linux.nixpkgs-lib-docs Build done.
Details
buildbot/nix-eval Build done.
Details
ef3ef45d46
All checks were successful
buildbot/nix-build .#checks.x86_64-linux.lix-docs Build done.
Details
buildbot/nix-build .#checks.x86_64-linux.aux-wiki Build done.
Details
buildbot/nix-build .#checks.x86_64-linux.manual-assets Build done.
Details
buildbot/nix-build .#checks.x86_64-linux.nixpkgs-lib-docs Build done.
Details
buildbot/nix-eval Build done.
Details
This pull request has changes conflicting with the target branch.
  • flake.nix
  • packages/aux-wiki/default.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-1:minion-patch-1
git checkout minion-patch-1

Merge

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

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?