WIP: Preview of tour changes #76

Draft
stb wants to merge 3 commits from preview into main
Owner

do not merge

do not merge
Sync 40C3 Hackertours tours from Hackertours-Admin (all tours)
All checks were successful
/ build (pull_request) Successful in 2m15s
/ accessibility (pull_request) Successful in 4m5s
cc68f58180
stb changed title from Preview of tour changes to WIP: Preview of tour changes 2026-11-16 14:42:05 +01:00
You can view your changes at https://staging.hackertours.hamburg.ccc.de/pr76/
Sync 40C3 Hackertours tours from Hackertours-Admin (all tours)
All checks were successful
/ build (pull_request) Successful in 2m16s
/ accessibility (pull_request) Successful in 4m1s
d1e39348bc
Sync 40C3 Hackertours tours from Hackertours-Admin (all tours)
All checks were successful
/ build (pull_request) Successful in 2m22s
/ accessibility (pull_request) Successful in 4m3s
461eb0447c
All checks were successful
/ build (pull_request) Successful in 2m22s
/ accessibility (pull_request) Successful in 4m3s
This pull request has changes conflicting with the target branch.
  • data/schedule/40c3.yaml
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 'preview:preview'
git switch 'preview'

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 'preview'
git switch 'preview'
git rebase 'main'
git switch 'main'
git merge --ff-only 'preview'
git switch 'preview'
git rebase 'main'
git switch 'main'
git merge --no-ff 'preview'
git switch 'main'
git merge --squash 'preview'
git switch 'main'
git merge --ff-only 'preview'
git switch 'main'
git merge 'preview'
git push origin 'main'
Sign in to join this conversation.
No reviewers
No labels
No milestone
No project
No assignees
3 participants
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
CCCHH/hackertours!76
No description provided.