arcana/arcana
0
0
Fork 2
Code Issues 20 Pull requests 7 Projects Releases 1 Packages Wiki Activity Actions 7

feat(colmena-nix-darwin-server): init #21

Open
ecoppens wants to merge 29 commits from feature/colmena-nix-darwin-server into feature/custom-activation
pull from: feature/colmena-nix-darwin-server
merge into: arcana:feature/custom-activation
Conversation 0 Commits 29 Files changed 84 +3124 -408
ecoppens commented 2025-09-11 21:04:41 +00:00 (Migrated from git.dgnum.eu)
Copy link
No description provided.
This pull request has changes conflicting with the target branch.
  • Cargo.lock
  • Cargo.toml
  • colmena-base-server/src/activation.rs
  • colmena-base-server/src/service.rs
  • colmena-nixos-server/src/host.rs
  • colmena-nixos-server/src/service.rs
  • colmena-proto/activation/activation_service.proto
  • colmena-proto/activation/apply_request.proto
  • colmena-proto/activation/build_request.proto
  • colmena/src/nix/host/custom.rs
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin feature/colmena-nix-darwin-server:feature/colmena-nix-darwin-server
git switch feature/colmena-nix-darwin-server

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 switch feature/custom-activation
git merge --no-ff feature/colmena-nix-darwin-server
git switch feature/colmena-nix-darwin-server
git rebase feature/custom-activation
git switch feature/custom-activation
git merge --ff-only feature/colmena-nix-darwin-server
git switch feature/colmena-nix-darwin-server
git rebase feature/custom-activation
git switch feature/custom-activation
git merge --no-ff feature/colmena-nix-darwin-server
git switch feature/custom-activation
git merge --squash feature/colmena-nix-darwin-server
git switch feature/custom-activation
git merge --ff-only feature/colmena-nix-darwin-server
git switch feature/custom-activation
git merge feature/colmena-nix-darwin-server
git push origin feature/custom-activation
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
arcana/arcana!21
No description provided.