blund/ji
Watch
1
0
Fork
You've already forked ji
 0
Code Issues 2 Pull requests 1 Projects Releases Packages Wiki Activity Actions

add mac support #3

Open
blund wants to merge 1 commit from mac-support into main
pull from: mac-support
merge into: blund:main
Conversation 0 Commits 1 Files changed 7 +719 -95
blund commented 2026-04-29 12:03:29 +02:00
Owner
Copy link
No description provided.
This pull request has changes conflicting with the target branch.
  • Makefile
  • flake.lock
  • flake.nix
  • src/copy-and-patch/gen_stencils.py
  • src/native.c
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 mac-support:mac-support
git switch mac-support

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 mac-support
git switch mac-support
git rebase main
git switch main
git merge --ff-only mac-support
git switch mac-support
git rebase main
git switch main
git merge --no-ff mac-support
git switch main
git merge --squash mac-support
git switch main
git merge --ff-only mac-support
git switch main
git merge mac-support
git push origin main
Sign in to join this conversation.
Reviewers
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
blund/ji!3
No description provided.