merge main into visual-toc, resolve conflicts keeping visual-toc #3

Open

Musi95 wants to merge 55 commits from visual-toc into main

Musi95 commented

2026-10-08 22:58:15 +00:00

(Migrated from github.com)

No description provided.

This pull request has changes conflicting with the target branch.

README.md

View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Merge commit title

Merge pull request 'merge main into visual-toc, resolve conflicts keeping visual-toc' (#3) from visual-toc into main

Merge commit body

Reviewed-on: https://git.doughston.dev/GRID0-net/GRID0/pulls/3

Merge pull request 'merge main into visual-toc, resolve conflicts keeping visual-toc' (#3) from visual-toc into main

Reviewed-on: https://git.doughston.dev/GRID0-net/GRID0/pulls/3

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u origin visual-toc:visual-toc

git switch visual-toc

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 visual-toc

git switch visual-toc

git rebase main

git switch main

git merge --ff-only visual-toc

git switch visual-toc

git rebase main

git switch main

git merge --no-ff visual-toc

git switch main

git merge --squash visual-toc