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

Fixed: justfile not changing when using initialize-template #15

Open
Sara wants to merge 4 commits from Sara/godot-module-template:fix/initialize-template-failing into development
pull from: Sara/godot-module-template:fix/initialize-template-failing
merge into: hertog:development
Conversation 1 Commits 4 Files changed 2 +6 -1
Sara commented 2025-09-03 19:41:33 +00:00
Contributor
Copy link
No description provided.
Sara added 3 commits 2025-09-03 19:41:33 +00:00
Sara added 1 commit 2025-09-03 19:42:53 +00:00
Sara commented 2025-09-03 19:44:07 +00:00
Author
Contributor
Copy link

forgor to merge, did now

forgor to merge, did now
This pull request has changes conflicting with the target branch.
  • justfile
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u fix/initialize-template-failing:Sara-fix/initialize-template-failing
git checkout Sara-fix/initialize-template-failing

Merge

Merge the changes and update on Forgejo.
git checkout development
git merge --no-ff Sara-fix/initialize-template-failing
git checkout development
git merge --ff-only Sara-fix/initialize-template-failing
git checkout Sara-fix/initialize-template-failing
git rebase development
git checkout development
git merge --no-ff Sara-fix/initialize-template-failing
git checkout development
git merge --squash Sara-fix/initialize-template-failing
git checkout development
git merge --ff-only Sara-fix/initialize-template-failing
git checkout development
git merge Sara-fix/initialize-template-failing
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#15
No description provided.
Delete branch "Sara/godot-module-template:fix/initialize-template-failing"

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?