KropCloud/services
2
0
Fork 0
Code Issues 1 Pull requests 11 Projects Releases Packages Wiki Activity Actions

WIP: added bluemap #2

Draft
JustScreaMy wants to merge 2 commits from mc-bluemap into master
pull from: mc-bluemap
merge into: KropCloud:master
Conversation 0 Commits 2 Files changed 2 +34 -7
JustScreaMy commented 2025-04-16 12:52:43 +00:00
Owner
Copy link
No description provided.
This pull request has changes conflicting with the target branch.
  • manifests/minecraft-servers/servers/krop.yaml
  • manifests/minecraft-servers/servers/kustomization.yaml
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin mc-bluemap:mc-bluemap
git switch mc-bluemap

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 master
git merge --no-ff mc-bluemap
git switch mc-bluemap
git rebase master
git switch master
git merge --ff-only mc-bluemap
git switch mc-bluemap
git rebase master
git switch master
git merge --no-ff mc-bluemap
git switch master
git merge --squash mc-bluemap
git switch master
git merge --ff-only mc-bluemap
git switch master
git merge mc-bluemap
git push origin master
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
KropCloud/services!2
No description provided.