ArkHost/HelixNotes
14
150
Fork
You've already forked HelixNotes
13

feature/templates #199

Open
RockyRoad226 wants to merge 3 commits from RockyRoad226/HelixNotes:feature/templates into main
pull from: RockyRoad226/HelixNotes:feature/templates
merge into: ArkHost:main
ArkHost:main
ArkHost:fix/vault-indication
Contributor
Copy link

WIP: Templates, New notebook icons

WIP: Templates, New notebook icons
This pull request has changes conflicting with the target branch.
  • src/lib/components/Sidebar.svelte
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 feature/templates:RockyRoad226-feature/templates
git switch RockyRoad226-feature/templates

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 RockyRoad226-feature/templates
git switch RockyRoad226-feature/templates
git rebase main
git switch main
git merge --ff-only RockyRoad226-feature/templates
git switch RockyRoad226-feature/templates
git rebase main
git switch main
git merge --no-ff RockyRoad226-feature/templates
git switch main
git merge --squash RockyRoad226-feature/templates
git switch main
git merge --ff-only RockyRoad226-feature/templates
git switch main
git merge RockyRoad226-feature/templates
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
ArkHost/HelixNotes!199
Reference in a new issue
ArkHost/HelixNotes
No description provided.
Delete branch "RockyRoad226/HelixNotes:feature/templates"

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?