godot
godot copied to clipboard
godotengine
Fix CharacterBody3D slide
Fix not being able to slide when jumping up a slope even if "stop on slope" is set to false Fixes bug: https://github.com/godotengine/godot/issues/74333
Bugsquad edit:
- Fix #74333
What are the checks? I'm not familiar with all the github stuff, but I want to contribute. Does it matter if those checks fail- all I modified are just two lines of code.
It was a temporary issue due to the new SCons release. You need to rebase the branch and force push to get the fixed CI config so that the checks pass. (See PR workflow.)
This PR hasn't been updated. Did you rebase it locally, but then forgot to push to your remote? You would need to push your local patch-1 branch to your fork with git push --force origin patch-1 (assuming origin is your fork).
Sadly you did a git merge instead of a git rebase, so there's now an extra commit which we don't want in the merged history. git rebase upstream/master followed by git push --force should fix it.
any idea on how to go back to previous versions?.. not sure why it is showing all those files. I'm using github desktop. Whenever I try to rebase, it says branch is up to date with master
@prominentdetail See this documentation article, or for a GUI option, this video. GitHub Desktop is not a very good Git client, it likes to do some things that we don't want (like locally merging upstream master).
I switched to gitkraken, but it's not explaining how to reset stuff :\
@prominentdetail You need to go back to when you only had one commit, then rebase that, then push that. Another option is you can right-click a commit in GitKraken and click the cherry-pick button to grab that commit by itself.
By the way, thanks for the help everyone. Hopefully I'll get better at this process.