WIP: bundled-headscale #3

Draft

jessebot wants to merge 25 commits from bundled-headscale into main

jessebot commented

2026-02-03 08:33:52 +00:00

(Migrated from git.smallhack.org)

No description provided.

This pull request has changes conflicting with the target branch.

charts/headplane/README.md
charts/headplane/values.yaml

View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Merge commit title

Merge pull request 'WIP: bundled-headscale' (#3) from bundled-headscale into main

Merge commit body

Reviewed-on: https://git.open.engineering/oeng/headplane-chart/pulls/3

Merge pull request 'WIP: bundled-headscale' (#3) from bundled-headscale into main

Reviewed-on: https://git.open.engineering/oeng/headplane-chart/pulls/3

Checkout

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

git fetch -u origin bundled-headscale:bundled-headscale

git switch bundled-headscale

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 bundled-headscale

git switch bundled-headscale

git rebase main

git switch main

git merge --ff-only bundled-headscale

git switch bundled-headscale

git rebase main

git switch main

git merge --no-ff bundled-headscale

git switch main

git merge --squash bundled-headscale