hertog/godot-module-template
Template
2
1
Fork 1
Code Issues 2 Pull requests 2 Projects Releases Packages Wiki Activity Actions

feat/refactor-releases #17

Open
Sara wants to merge 0 commits from feat/refactor-releases into development
pull from: feat/refactor-releases
merge into: hertog:development
Conversation 0 Commits - Files changed -
Sara commented 2026-01-28 22:32:32 +00:00
Contributor
Copy link

do merge the .dir-locals one before this I think i forked off the wrong branch

do merge the .dir-locals one before this I think i forked off the wrong branch
Sara added 5 commits 2026-01-28 22:32:33 +00:00
Sara added 1 commit 2026-01-29 10:30:56 +00:00
This branch is already included in the target branch. There is nothing to merge.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin feat/refactor-releases:feat/refactor-releases
git checkout feat/refactor-releases

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 checkout development
git merge --no-ff feat/refactor-releases
git checkout feat/refactor-releases
git rebase development
git checkout development
git merge --ff-only feat/refactor-releases
git checkout feat/refactor-releases
git rebase development
git checkout development
git merge --no-ff feat/refactor-releases
git checkout development
git merge --squash feat/refactor-releases
git checkout development
git merge --ff-only feat/refactor-releases
git checkout development
git merge feat/refactor-releases
git push origin development
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: hertog/godot-module-template#17
No description provided.
Delete branch "feat/refactor-releases"

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?