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

Add .dir-locals.el emacs config file #16

Open
Sara wants to merge 3 commits from feat/dir-locals.el into development
pull from: feat/dir-locals.el
merge into: hertog:development
Conversation 0 Commits 3 Files changed 3 +11 -2
Sara commented 2025-12-29 16:15:05 +00:00
Contributor
Copy link
No description provided.
Sara added 3 commits 2025-12-29 16:15:05 +00:00
This pull request has changes conflicting with the target branch.
  • .gitignore
View command line instructions

Checkout

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

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/dir-locals.el
git checkout feat/dir-locals.el
git rebase development
git checkout development
git merge --ff-only feat/dir-locals.el
git checkout feat/dir-locals.el
git rebase development
git checkout development
git merge --no-ff feat/dir-locals.el
git checkout development
git merge --squash feat/dir-locals.el
git checkout development
git merge --ff-only feat/dir-locals.el
git checkout development
git merge feat/dir-locals.el
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#16
No description provided.
Delete branch "feat/dir-locals.el"

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?