Stacken/c64-livecoding
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

WIP: Integration #3

Draft
duuqnd wants to merge 24 commits from integration into main
pull from: integration
merge into: Stacken:main
Conversation 0 Commits 24 Files changed 123 +139 -2009
duuqnd commented 2025-07-25 13:10:40 +02:00
Owner
Copy link
No description provided.
duuqnd added 24 commits 2025-07-25 13:10:41 +02:00
This pull request has changes conflicting with the target branch.
  • wip-hugo/STARTUP.s
  • wip-hugo/build.sh
  • wip-hugo/routines/circle/circle_test_position.s
  • wip-hugo/routines/circle/circle_test_size.s
  • wip-hugo/routines/line/line.s
  • wip-hugo/routines/line/line_down.s
  • wip-hugo/routines/line/line_down_inv.s
  • wip-hugo/routines/line/line_test_extensive.s
  • wip-hugo/routines/line/line_up.s
  • wip-hugo/routines/line/line_up_inv.s
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin integration:integration
git checkout integration

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 checkout main
git merge --no-ff integration
git checkout integration
git rebase main
git checkout main
git merge --ff-only integration
git checkout integration
git rebase main
git checkout main
git merge --no-ff integration
git checkout main
git merge --squash integration
git checkout main
git merge --ff-only integration
git checkout main
git merge integration
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: Stacken/c64-livecoding#3
No description provided.
Delete branch "integration"

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?