| 51 | | Always update your local copy of the official repository (git fetch official) before pushing your work. If possible, use "git rebase official/staging" to ensure that your changes are on top of the very latest commits from the staging branch - that will make them easier to merge. If you are nervous about trying this on a branch with lots of your hard work in it, create a new copy of that branch first - so if the rebase goes horribly wrong, your original branch is untouched. |
| | 51 | Always update your local copy of the official repository (git fetch official) before pushing your work. If possible, use "git rebase official/staging" to ensure that your changes are on top of the very latest commits from the staging branch - that will make them easier to merge, and is much neater than merging official branches into your branches and having the devteam merge them back again. If you are nervous about trying rebase on a branch with lots of your hard work in it, create a new copy of that branch first - so if the rebase goes horribly wrong, your original branch is untouched. |
| | 52 | |
| | 53 | When submitting pull requests on github, please ensure that you choose only the commits relevant to this request - try and avoid choosing merge commits or commits which are part of another pull request. |
