2
8
Fork
You've already forked Chipmunk2D
3

Resolved undefined symbol __android_log_print and CP_USE_DOUBLES in arm32 #251

Open
padmadevd wants to merge 2 commits from padmadevd/master into master
pull from: padmadevd/master
merge into: slembcke:master
slembcke:master
slembcke:6.2.x
slembcke:glfw3
slembcke:cpp
slembcke:GL3
slembcke:GLFW-refactor
slembcke:custom-contact
slembcke:UnityTemp
slembcke:6.1.x
slembcke:speculative
slembcke:surfacev
padmadevd commented 2024年09月01日 12:27:33 +02:00 (Migrated from github.com)
Copy link
No description provided.
This pull request can be merged automatically.
This branch is out-of-date with the base branch
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 origin padmadevd/master:padmadevd/master
git switch padmadevd/master

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 padmadevd/master
git switch padmadevd/master
git rebase master
git switch master
git merge --ff-only padmadevd/master
git switch padmadevd/master
git rebase master
git switch master
git merge --no-ff padmadevd/master
git switch master
git merge --squash padmadevd/master
git switch master
git merge --ff-only padmadevd/master
git switch master
git merge padmadevd/master
git push origin master
Sign in to join this conversation.
No reviewers
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
slembcke/Chipmunk2D!251
Reference in a new issue
slembcke/Chipmunk2D
No description provided.
Delete branch "padmadevd/master"

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?