Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add NAOMI #3928

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Add NAOMI #3928

wants to merge 11 commits into from

Conversation

PhillBenoit
Copy link

Added new system NAOMI. Keeping Flycast associated with arcade is a bad idea. Flycast will never open anything but NAOMI (and Atomiswave) subset of arcade games. In a desperate attempt to just get the system in, I have left it associated with arcade for now in hopes that people who put their NAOMI games in to the appropriate NAOMI folder will never have a problem trying to load an emulator that will never play their game.

@joolswills
Copy link
Member

There are a couple of unrelated changes in this PR (EOL character from one file and the microsoft VS changes in .gitignore) and there seems to be a number of commits. Please can you squash the commits and create a single commit with just the Naomi changes (with a suitable commit description). If you're unsure how to do that, please create a new branch and re-implement the changes in a new PR.

@PhillBenoit
Copy link
Author

The changes and new pull request all came at the request of the last person I was dealing with. There is no way to do what you're requesting on the github web site. Visual Studio and github desktop both will not allow me to squash the commits. I am trying to do what you want but there seems to be no way to do it.

@retropieuser
Copy link
Contributor

retropieuser commented Jul 9, 2024

Hi there, I think you can use the squash and merge function on the web browser interface to put these commits into one 👍 edit: I think when reviewing you can squash and merge but need the right permissions

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.

3 participants