DGNum/colmena
10
0
Fork 3
Code Issues 6 Pull requests 3 Projects Releases Packages Wiki Activity

WIP: custom activation #18

Draft
ecoppens wants to merge 25 commits from feature/custom-activation into main
pull from: feature/custom-activation
merge into: DGNum:main
Conversation 1 Commits 25 Files changed 84 +3112 -420
ecoppens commented 2025-06-08 23:24:00 +02:00
Owner
Copy link
No description provided.
thubrecht reviewed 2025-06-08 23:25:39 +02:00
flake.nix Outdated
@ -83,6 +83,7 @@
devShell = pkgs.mkShell {
RUST_SRC_PATH = "${pkgs.rustPlatform.rustLibSrc}";
NIX_PATH = "nixpkgs=${pkgs.path}";
PROTOC = "${pkgs.protobuf}/bin/protoc";
thubrecht commented 2025-06-08 23:25:39 +02:00
Owner
Copy link

getExe' pkgs.protobuf "protoc"

`getExe' pkgs.protobuf "protoc"`
ecoppens marked this conversation as resolved
ecoppens force-pushed feature/custom-activation from d6bad0d85f to 04dfa25d0b 2025-06-09 13:57:28 +02:00 Compare
ecoppens force-pushed feature/custom-activation from 04dfa25d0b to c6720d7bc8 2025-08-04 22:23:37 +02:00 Compare
ecoppens force-pushed feature/custom-activation from fc7964eb0a to d9e41ab07d 2025-08-05 14:10:05 +02:00 Compare
This pull request is marked as a work in progress.
This branch is out-of-date with the base branch
View command line instructions

Checkout

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

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 main
git merge --no-ff feature/custom-activation
git switch feature/custom-activation
git rebase main
git switch main
git merge --ff-only feature/custom-activation
git switch feature/custom-activation
git rebase main
git switch main
git merge --no-ff feature/custom-activation
git switch main
git merge --squash feature/custom-activation
git switch main
git merge --ff-only feature/custom-activation
git switch main
git merge feature/custom-activation
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
2 participants
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: DGNum/colmena#18
No description provided.
Delete branch "feature/custom-activation"

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?