kramo/CommitEdit
2
6
Fork
You've already forked CommitEdit
0

WIP: Syntax highlighting #4

Draft
kra-mo wants to merge 6 commits from syntax-highlighting into main
pull from: syntax-highlighting
merge into: kramo:main
kramo:main
kra-mo commented 2024年12月14日 17:20:53 +01:00 (Migrated from github.com)
Copy link

Fixes #1

Fixes #1
kra-mo commented 2024年12月14日 17:21:26 +01:00 (Migrated from github.com)
Copy link

It can currently lag quite a bit due to the package used, I wonder if there is a better one that I could use...

It can currently lag quite a bit due to the package used, I wonder if there is a better one that I could use...
kra-mo commented 2024年12月15日 00:19:33 +01:00 (Migrated from github.com)
Copy link

Highlightr seems to flicker the same way... sigh (plus it wouldn't work with comments, etc.)

[Highlightr](https://github.com/raspu/Highlightr/tree/bcf2d0590f32ac2528feb72d7e34f5b463801a47) seems to flicker the same way... *sigh* (plus it wouldn't work with comments, etc.)
This pull request has changes conflicting with the target branch.
  • CommitEdit/EditorView.swift
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 origin syntax-highlighting:syntax-highlighting
git switch syntax-highlighting

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 syntax-highlighting
git switch syntax-highlighting
git rebase main
git switch main
git merge --ff-only syntax-highlighting
git switch syntax-highlighting
git rebase main
git switch main
git merge --no-ff syntax-highlighting
git switch main
git merge --squash syntax-highlighting
git switch main
git merge --ff-only syntax-highlighting
git switch main
git merge syntax-highlighting
git push origin main
Sign in to join this conversation.
No reviewers
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
kramo/CommitEdit!4
Reference in a new issue
kramo/CommitEdit
No description provided.
Delete branch "syntax-highlighting"

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?