2. Altering your github pull request
Last updated by Steve Clay Comments (5)
You've submitted a pull request ("PR") against the Elgg repo and core members have asked you to make some changes.
Check out your work branch in case you've been working on something else in your local repo:
cd ~/htdocs/elgg112 git checkout my-branch-name
Make your changes as necessary, test and commit them as an amendment:
git commit --amend
This will merge your changes into your last commit.
What if I have several commits? We generally prefer you to "squash" these into one commit. This is a quick operation but scary the first time, so watch one of these videos and follow a tutorial.
To update your PR, just re-push to your github repo:
git push -f
On the PR page you'll see the additional commits at the bottom. If you think necessary, add a brief note describing the changes.
That's it!
Feedback and Planning
Discussions about the past, present, and future of Elgg and this community site.
May we assume that you prefer adding multiple commits to pull request instead of ammending existing commit?
I'd say it's author preference because the history will show the author's name next to those changes :) Feel free to squash/rebase as your feel necessary (e.g. if improves readability of the diff), but not required.
I meant rather simple corretions as some missing spaces to meet coding standards. It's also nice that Github handles now comments on outdated commits in pull request, w remember it wasn't so nice as I was making first PRs.
I think we'd prefer to accept small coding standards violations. We can fix those when we merge, or just live with them until a cleanup happens.
Might want to update this with info on how to rebase given our new strict single-commit with properly formatted commit message policy. I just had to do this and squash 4 commits, I don't think it's a very intuitive or user-friendly thing for a casual coder to do. I (re)found this page while looking for a decent explanation for how best to do it.
These cli instructions are pretty good:
http://stackoverflow.com/questions/2563632/how-can-i-merge-two-commits-into-one