Closed hvdwolf closed 6 years ago
That's not the right way to "undo" changes in git. What you will want to do on your local machine, is "git reset --hard HEAD~1" to remove the most recent commit (the "undo removal of averaging" commit), and follow that with a "git revert 5f315957d85a7dc05ff6c0197b9d261eac1734bd", then do a "git push --force" to get that up to github.
In the future, you will want to create a new branch when you are going to submit a pull request, and make the pull request from the new branch. That way you can keep working on your other branches without the pull request being changed.
Sorry.
I had committed my "no averaging" code before you had pulled in the stable changes. I will need to test further before we might consider this "no averaging necessary".