chipmunkmc/tgb-extras
1
0
Fork 1
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity

Cocaine + /afk #1

Open
isnortkoolaid wants to merge 3 commits from isnortkoolaid/tgb-extras:main into main
pull from: isnortkoolaid/tgb-extras:main
merge into: chipmunkmc:main
Conversation 0 Commits 3 Files changed 14 +147 -11
isnortkoolaid commented 2024-01-12 20:43:47 -05:00
First-time contributor
Copy link
No description provided. 
# Conflicts:
#	src/main/java/land/chipmunk/tgbextras/Extras.java
#	src/main/java/land/chipmunk/tgbextras/commands/SpawnCoordinatesCommand.java
This pull request has changes conflicting with the target branch.
  • src/main/java/land/chipmunk/tgbextras/commands/AFKCommand.java
  • src/main/java/land/chipmunk/tgbextras/mixin/ServerPlayerEntityMixin.java
  • src/main/java/land/chipmunk/tgbextras/modules/PlayerExtensions.java
View command line instructions

Checkout

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

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 isnortkoolaid-main
git switch isnortkoolaid-main
git rebase main
git switch main
git merge --ff-only isnortkoolaid-main
git switch isnortkoolaid-main
git rebase main
git switch main
git merge --no-ff isnortkoolaid-main
git switch main
git merge --squash isnortkoolaid-main
git switch main
git merge --ff-only isnortkoolaid-main
git switch main
git merge isnortkoolaid-main
git push origin main
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
chipmunkmc/tgb-extras!1
No description provided.