paulbnl wrote:Re-forking the repo is unnecessary. You should be creating a new branch for every pull request so you don't mess with the master branch. If you create a pull request and then later push updates to the same branch then it will update the pull request.
So you can either use interactive rebase to merge commits, use git reset HEAD~1 to undo the previous commit without losing your changes or use git commit --amend to update the last commit and then push to the same branch.
Here is how to cleanly update the master branch from the MiSTer repo:
Thanks for the help. I knew all this was possible, but git is tricky when you don't use it often or at all. We'll see if I can fix anything without breaking my fork. If not, then I can re-fork and follow instructions better by putting changes in a branch like I should have done in the first place.
My current plan is to recompute the filter for 96khz like sorgelig wants. Then like jotego has warned me about and JamesF wants too, resampling without properly low-passing is bad, so I want to implement a higher order low-pass filter that might be useful in other cores. The current filters are low order and can really only copy simple (-6db or -12db/octave) analog filters that original hardware had. That's maybe not enough for some digital audio problems, so another type of filter may be useful.