forge/ayaports
1
0
Fork 0
Code Issues 14 Pull requests 8 Projects Releases Packages Wiki Activity Actions

WIP: user/papermc: move from unmaintained, update to 1.21.0 #587

Draft
forge wants to merge 1 commit from papermc/update-1.21.0 into edge
pull from: papermc/update-1.21.0
merge into: forge:edge
Conversation 0 Commits 1 Files changed 8 +13 -11
forge commented 2024-08-30 13:43:14 +00:00
Owner
Copy link
No description provided.
forge added 1 commit 2024-08-30 13:43:15 +00:00
user/papermc: move from unmaintained, update to 1.21.0
Some checks failed
/ lint (pull_request) Failing after 30s
Details
/ deploy-x86_64 (pull_request) Has been skipped
Details
/ build-x86_64 (pull_request) Failing after 1m9s
Details
/ deploy-aarch64 (pull_request) Has been skipped
Details
/ build-aarch64 (pull_request) Failing after 3m20s
Details
305a37dfab
forge changed title from user/papermc: move from unmaintained, update to 1.21.0 to WIP: user/papermc: move from unmaintained, update to 1.21.0 2024-09-03 16:27:52 +00:00
Some checks failed
/ lint (pull_request) Failing after 30s
Details
/ deploy-x86_64 (pull_request) Has been skipped
Details
/ build-x86_64 (pull_request) Failing after 1m9s
Details
/ deploy-aarch64 (pull_request) Has been skipped
Details
/ build-aarch64 (pull_request) Failing after 3m20s
Details
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 papermc/update-1.21.0:papermc/update-1.21.0
git checkout papermc/update-1.21.0

Merge

Merge the changes and update on Forgejo.
git checkout edge
git merge --no-ff papermc/update-1.21.0
git checkout edge
git merge --ff-only papermc/update-1.21.0
git checkout papermc/update-1.21.0
git rebase edge
git checkout edge
git merge --no-ff papermc/update-1.21.0
git checkout edge
git merge --squash papermc/update-1.21.0
git checkout edge
git merge --ff-only papermc/update-1.21.0
git checkout edge
git merge papermc/update-1.21.0
git push origin edge
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
Backport

   
Enhancement

   
Fix

   
Maintenance

   
Needs action

   
New aport

   
Security

   
Upstreamed
No labels
Backport
Enhancement
Fix
Maintenance
Needs action
New aport
Security
Upstreamed
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: forge/ayaports#587
No description provided.
Delete branch "papermc/update-1.21.0"

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?