squatnet/gdextension

Watch

Fork 0

rrt #2

Open

Squatnet wants to merge 19 commits from nathanfranke/main into 4.3

Squatnet commented

2024-11-03 20:20:28 +01:00

(Migrated from github.com)

No description provided.

This pull request has changes conflicting with the target branch.

.github/workflows/build.yml
godot-cpp
project/addons/example/example.gdextension

View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Merge commit title

Merge pull request 'rrt' (#2) from nathanfranke/main into 4.3

Merge commit body

Reviewed-on: https://git.squatnet.co.uk/squatnet/gdextension/pulls/2

Merge pull request 'rrt' (#2) from nathanfranke/main into 4.3

Reviewed-on: https://git.squatnet.co.uk/squatnet/gdextension/pulls/2

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u origin "nathanfranke/main:nathanfranke/main"

git switch "nathanfranke/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 "4.3"

git merge --no-ff "nathanfranke/main"

git switch "nathanfranke/main"

git rebase "4.3"

git switch "4.3"

git merge --ff-only "nathanfranke/main"

git switch "nathanfranke/main"

git rebase "4.3"

git switch "4.3"

git merge --no-ff "nathanfranke/main"

git switch "4.3"

git merge --squash "nathanfranke/main"

git switch "4.3"

git merge --ff-only "nathanfranke/main"

git switch "4.3"

git merge "nathanfranke/main"

git push origin "4.3"

No reviewers

No labels

No milestone

No project

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

squatnet/gdextension!2

No description provided.

Rows
Columns