Skip to content

Conversation

@psco
Copy link
Contributor

@psco psco commented Oct 21, 2025

An appropriate boot ROM is chosen based on the attached disk image.

Copy link
Contributor

@hharte hharte left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hello Peter,

The change looks good.

You may want to squash out the merge commits with "git rebase -i <hash_before_your_first_commit>"

Take care,
Howard

larsbrinkhoff and others added 8 commits October 26, 2025 08:36
Adds support for the ISO/European "left backslash" or "less than" key.
It's found between left shift and Z.
This emulates the classic LINC.  The design was settled in 1965,
increasing memory to 2048 words, and adding a Z register, an overflow
flag, and an interrupt facility.
These are tests for the classic LINC, including the features new in
1965: 2048 words of memory, a Z register, an overflow flag, and an
interrupt facility.
Block 45 held damaged data, and block 51 was identical to block 52.
@psco
Copy link
Contributor Author

psco commented Oct 26, 2025

Will be replaced by a new PR without the commit clutter.

@psco psco closed this Oct 26, 2025
@hharte
Copy link
Contributor

hharte commented Oct 26, 2025

Hello Peter,

To fix your master branch, you can do the following:

  1. Add the opensimh repository as a remote:
    git remote add opensimh git@github.com:open-simh/simh.git

  2. Fetch from opensimh:
    git fetch opensimh

  3. Rebase your changes on top of opensimh/master:
    git rebase opensimh/master

  4. There will be one merge conflict, which you can skip:
    git rebase --skip

  5. Then run "git log" and you should see this:

Author: Peter Schorn <peter.schorn@acm.org>
Date:   Tue Oct 21 11:07:02 2025 +0200

    AltairZ80: Improved choice of boot ROM

commit 4d38373206cd7c0ce8b94f5e16bd4429cb96430f (opensimh/master)
Author: Mark Pizzolato <mark@infocomm.com>
Date:   Sun Oct 12 07:58:51 2025 +0200

    LINC: Add Visual Studio project files.
  1. You can then remove the opensimh remote if you do not want it anymore:
    git remote rm opensimh

  2. If you want to prevent having those merge commits in the future, you can set the configuration for your repo to use the rebase strategy when doing git pull as follows:
    git config pull.rebase true

With this setting, "git pull" will always try to rebase your local changes on top of the upstream changes.

Take care,
Howard

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants