Simple initial example using command line development #2

Open
paulscottrobson wants to merge 10 commits from paulscottrobson/main into main
paulscottrobson commented 2025-08-24 17:22:42 +00:00 (Migrated from github.com)

Uses 64tass and a Makefile. Illustrates the in code breakpoint

Uses 64tass and a Makefile. Illustrates the in code breakpoint
smokku (Migrated from github.com) reviewed 2025-08-24 20:45:32 +00:00
@ -0,0 +1,31 @@
# **************************************************************************************
smokku (Migrated from github.com) commented 2025-08-24 20:44:57 +00:00

We defined EMULATOR variable, so let's use it.

	$(EMULATOR) -q file=test.xex	
We defined `EMULATOR` variable, so let's use it. ```suggestion $(EMULATOR) -q file=test.xex ```
smokku (Migrated from github.com) commented 2025-08-24 20:45:07 +00:00
	$(EMULATOR) -q file=test.xex break=EA
```suggestion $(EMULATOR) -q file=test.xex break=EA ```
paulscottrobson commented 2025-09-08 08:08:51 +00:00 (Migrated from github.com)

Forgot to fix these up. Rather puzzling that the conflict checker can't cope with the addition of a blank line ...

Forgot to fix these up. Rather puzzling that the conflict checker can't cope with the addition of a blank line ...
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 "paulscottrobson/main:paulscottrobson/main"
git switch "paulscottrobson/main"

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 "paulscottrobson/main"
git switch "paulscottrobson/main"
git rebase "main"
git switch "main"
git merge --ff-only "paulscottrobson/main"
git switch "paulscottrobson/main"
git rebase "main"
git switch "main"
git merge --no-ff "paulscottrobson/main"
git switch "main"
git merge --squash "paulscottrobson/main"
git switch "main"
git merge --ff-only "paulscottrobson/main"
git switch "main"
git merge "paulscottrobson/main"
git push origin "main"
Sign in to join this conversation.
No description provided.