Join GitHub today
GitHub is home to over 28 million developers working together to host and review code, manage projects, and build software together.Sign up
Fix wrong ender pearl behaviors #822
This pull request tries to fix the bug of malfunctioning ender pearls.
Another question: How can I pull request only on the current commit? For now, the commit history contains the previous fall damage fix. I tried to merge dev before commit but it didn't work.
To answer your question about your previous PR's commits being there: it looks like you merged that old branch into your new branch, effectively "pushing" the commits ahead of the dev branch (thus moving the commits to after the ones who were pushed in the meantime).
Usually, to avoid problems like this, you would keep your fork's dev branch intact and regularly git-pull from the base repository (this one). When you want to start a new branch, you create it off the latest dev branch commit.
git checkout dev # make sure you're in the dev branch (has to be clean) git remote add base https://github.com/GlowstoneMC/Glowstone.git git pull base dev # update your local dev branch git push origin dev # update your fork's dev branch, that way you can create branches on GitHub instead of command-line if you prefer git checkout -b my_pr_branch # create the new branch off of dev # ... add commits ... git push -u origin my_pr_branch # push the new branch to your fork # submit PR