Fixes done by Bjarke and Omar during Zig Day Nuremberg, Saturday 2026年04月11日
Fixes done by Bjarke and Omar during Zig Day Nuremberg, Saturday 2026年04月11日
zigday-fixes #2
Open
trebe
wants to merge 4 commits from
zigday-fixes into main
pull from: zigday-fixes
merge into: BSF:main
BSF:main
trebe
commented 2026年04月13日 15:33:39 +02:00
trebe
added 4 commits 2026年04月13日 15:33:40 +02:00
Checkpoint. Compiles. Now evaluates the output filename template in the Input struct. HACK to sleep while waiting for Recorder to create the file.
ecc132411f
Resolve conflict in root.zig
trebe
requested review from JanBeelte 2026年04月13日 15:36:40 +02:00
This pull request can be merged automatically.
You are not authorized to merge this pull request.
View command line instructions
Checkout
From your project repository, check out a new branch and test the changes.git fetch -u origin zigday-fixes:zigday-fixes
git switch zigday-fixes
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 zigday-fixes
git switch zigday-fixes
git rebase main
git switch main
git merge --ff-only zigday-fixes
git switch zigday-fixes
git rebase main
git switch main
git merge --no-ff zigday-fixes
git switch main
git merge --squash zigday-fixes
git switch main
git merge --ff-only zigday-fixes
git switch main
git merge zigday-fixes
git push origin main
Sign in to join this conversation.
No reviewers
Labels
Clear labels
No items
No labels
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
BSF/zLogScope!2
Loading...
Add table
Add a link
Reference in a new issue
No description provided.
Delete branch "zigday-fixes"
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?