1
1
Fork
You've already forked ivy
1

plugin: fix treesitter indent #1

Open
koibtw wants to merge 2 commits from koibtw/ivy:push-tuqrllosspwy into main
pull from: koibtw/ivy:push-tuqrllosspwy
merge into: comfysage:main
comfysage:main
First-time contributor
Copy link
No description provided.
This pull request has changes conflicting with the target branch.
  • config/lua/ivy/treesitter-indentexpr.lua
  • config/plugin/treesitter.lua
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u push-tuqrllosspwy:koibtw-push-tuqrllosspwy
git switch koibtw-push-tuqrllosspwy

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 main
git merge --no-ff koibtw-push-tuqrllosspwy
git switch koibtw-push-tuqrllosspwy
git rebase main
git switch main
git merge --ff-only koibtw-push-tuqrllosspwy
git switch koibtw-push-tuqrllosspwy
git rebase main
git switch main
git merge --no-ff koibtw-push-tuqrllosspwy
git switch main
git merge --squash koibtw-push-tuqrllosspwy
git switch main
git merge --ff-only koibtw-push-tuqrllosspwy
git switch main
git merge koibtw-push-tuqrllosspwy
git push origin main
Sign in to join this conversation.
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
comfysage/ivy!1
Reference in a new issue
comfysage/ivy
No description provided.
Delete branch "koibtw/ivy:push-tuqrllosspwy"

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?