Deuxfleurs/nixcfg
17
6
Fork 2
Code Issues 9 Pull requests 2 Projects Releases Wiki Activity

dathomir: Updates #29

Open
KokaKiwi wants to merge 2 commits from KokaKiwi/nixcfg:dathomir-update into main
pull from: KokaKiwi/nixcfg:dathomir-update
merge into: Deuxfleurs:main
Conversation 0 Commits 2 Files changed 18 +40 -21
KokaKiwi commented 2024-06-27 14:32:31 +00:00
Owner
Copy link
  • cluster(prod): Add ortie node
  • cluster(staging): Rename jupiter site to dathomir
  • Maybe remove io node from cluster/prod?
- cluster(prod): Add `ortie` node - cluster(staging): Rename `jupiter` site to `dathomir` * Maybe remove `io` node from cluster/prod?
KokaKiwi added 2 commits 2024-06-27 14:32:31 +00:00
maximilien approved these changes 2024-06-27 15:31:51 +00:00
This pull request can be merged automatically.
You are not authorized to merge this pull request.
View command line instructions.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u dathomir-update:KokaKiwi-dathomir-update
git checkout KokaKiwi-dathomir-update

Merge

Merge the changes and update on Forgejo.
git checkout main
git merge --no-ff KokaKiwi-dathomir-update
git checkout main
git merge --ff-only KokaKiwi-dathomir-update
git checkout KokaKiwi-dathomir-update
git rebase main
git checkout main
git merge --no-ff KokaKiwi-dathomir-update
git checkout main
git merge --squash KokaKiwi-dathomir-update
git checkout main
git merge --ff-only KokaKiwi-dathomir-update
git checkout main
git merge KokaKiwi-dathomir-update
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
maximilien
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
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: Deuxfleurs/nixcfg#29
No description provided.
Delete branch "KokaKiwi/nixcfg:dathomir-update"

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?