Deuxfleurs/nixcfg
18
6
Fork 2
Code Issues 10 Pull requests 2 Projects Releases Wiki Activity

WIP: use wgautomesh service definition from my nixpkgs PR #12

Draft
lx wants to merge 1 commit from wgautomesh-service-v2 into simplify-network-config
pull from: wgautomesh-service-v2
merge into: Deuxfleurs:simplify-network-config
Conversation 0 Commits 1 Files changed 3 +161 -124
lx commented 2023-03-31 14:42:45 +00:00
Owner
Copy link

We might be able to remove wgautomesh.nix once it is merged in Nixpkgs (probably for 23.05)

We might be able to remove wgautomesh.nix once it is merged in Nixpkgs (probably for 23.05)
lx added 1 commit 2023-03-31 14:42:46 +00:00
This pull request has changes conflicting with the target branch.
  • nix/deuxfleurs.nix
View command line instructions

Checkout

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

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 checkout simplify-network-config
git merge --no-ff wgautomesh-service-v2
git checkout wgautomesh-service-v2
git rebase simplify-network-config
git checkout simplify-network-config
git merge --ff-only wgautomesh-service-v2
git checkout wgautomesh-service-v2
git rebase simplify-network-config
git checkout simplify-network-config
git merge --no-ff wgautomesh-service-v2
git checkout simplify-network-config
git merge --squash wgautomesh-service-v2
git checkout simplify-network-config
git merge --ff-only wgautomesh-service-v2
git checkout simplify-network-config
git merge wgautomesh-service-v2
git push origin simplify-network-config
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: Deuxfleurs/nixcfg#12
No description provided.
Delete branch "wgautomesh-service-v2"

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?