search

Gemba / skyscraper

Powerful and versatile game data scraper written in Qt and C++.
https://gemba.github.io/skyscraper/
GNU General Public License v3.0
56 stars 14 forks source link

Added New Platforms #37

Closed maxexcloo closed 9 months ago

maxexcloo commented 9 months ago

I've added quite a few new platforms, these are based off https://github.com/XargonWan/RetroDECK/blob/main/es-configs/es_systems.xml and No-Intro DATs.

Gemba commented 9 months ago

Thanks, can you please squash/rebase the commits to one?

maxexcloo commented 9 months ago

Will try!

maxexcloo commented 9 months ago

Is it okay now? Haven't done a squash before so do let me know and I'll try again :)

Gemba commented 9 months ago

Almost. I accidentally put the 3.10.0 tag on the branch before I merged in my repo, sorry. Thus your squash does not look as it should.

From the distance, I would vote for this approach:

  1. Update your fork 'master' in github with mine 'master (to catchup the 7 commits behind)
  2. Then pull the changes to your local repo on your PC, git pull origin master.
  3. Take your changes and save it locally to your PC as new_platforms.patch: https://github.com/Gemba/skyscraper/compare/master..ee73abaa61f9a6188a3ac8a803690a981e51e32a.diff
  4. Run a git reset --hard HEAD~2 to get rid of the 2 commits ahead of my master.
  5. Apply the patch git apply /path/to/new_platforms.patch, git add, git commit -m 'Added new systems'
  6. Push (most likely you will need --force) the changes to your origin.
  7. It should show up also in this PR with one commit and two changed files only.

If it is too much, leave it with me: I can put your changes in outside of this PR, too.

maxexcloo commented 9 months ago

No that’s a really nice guide and I really appreciate the help - always grateful for someone who shows me how to do something properly so I can improve 🙏

I’ll have a go at that this morning!

maxexcloo commented 9 months ago

I see there are still merges from your repo - is this okay?

Gemba commented 9 months ago

Thanks. These extra commits are ok. As instant feedback, below is what I get presented before the merge (1 commit and only your changes):

before_merge