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

Update to rgbds 0.9.0 #60

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

Conversation

Xillicis
Copy link
Contributor

Updating again to the latest version of rgbds.

@rayrobdod
Copy link
Contributor

Ideally PRs only include the commits relevant to that PR. In this case, this PR should only include the changes for upgrading rgbds, and not include the pokedex naming stuff.

In the future, this means switching back to upstream/master before creating a branch when you start to work on something new.

As for this: I'm not sure how comfortable you are with rewriting history or detached heads, but since the rgbds commit does not conflict with the other commits here, IMO the easiest way to change this PR so that it only contains the changes from the "Updated to rgbds to version 0.9.0" commit is to, in your local:

  • git switch --detach upstream/master to start an unnamed branch at upstream/master
  • git cherry-pick e7a205c to apply commit e7a205c's ("Updated to rgbds to version 0.9.0") delta on the current HEAD
  • git log -1. See the line commit xxxxxxx (HEAD) line and note the xxxx value. This is the new commit's hash.
  • git switch update_to_rgbds_0.9.0 to switch back to this pr's branch
  • git reset --hard xxxxx, where xxxx was the previously noted commit hash. This will move the update_to_rgbds_0.9.0 branch to the new commit.
  • force push update_to_rgbds_0.9.0 to your fork.

Or I guess wait for the other PR to be merged. But even then "More label naming. More work to do." is pokedex stuff on this PR but not the other PR.

@Xillicis
Copy link
Contributor Author

Oh that's my bad. Thanks for the suggestions. I didnt realize the other pokedex stuff was there. I thought I had made a clean branch. I should have looked more closely. I could just copy the files that were changed for rgbds 0.9.0 and try making a clean branch from the master branch on my fork. So I'll probably close this pull request and try again or try the things you suggested when I'm back at my desktop.

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.

2 participants