On Thursday, January 30, 2014 11:04:52 AM UTC-4, Ms2ger wrote: > Right now, I've been requesting that people squash those commits > > before landing. That does lead to the additional overhead that kmc > > describes, but it makes reviewing a lot easier and the history cleaner. > > I think it would be optimal if bors squashed automatically when merging. > > I guess we need a volunteer to get that done. > > > > HTH > > Ms2ger
Indeed - I'd also notice about rebasing against origin/master _before_ forcing update your repository - this way you could catch last-minute code changes that might end up in bors failing at build step. My usual steps are now the following: 1. Create a local branch: $ git checkout -b <local_branch> --track origin/master 2. Code/hack/do stuff then commit: $ git commit -a 3. Push local branch to your cloned repository: $ git push <your_repository> <local_branch> 4. Create a PR in GitHub (which also creates a Critic link automagically) 5. Wait for reviewers' feedback - if something needs to be fixed, fix it in a separate patch: (step 2) and then push it to your cloned repository without forcing (step 3) 6. After receiving "Accepted" in Critic, squash or fixup all your patches together (I usually do fixup, as I tend to provide complete commit changelog on the first patch): $ git rebase -i origin/master 7. Update origin/master, rebasing your local branch so you make sure your patch still applies correctly: $ git pull --rebase 8. Finally do a force push (and further ask for r? on #servo): $ git push -f <your_repository> <local_branch> This could be documented on Servo's Wiki - what do you guys think? _______________________________________________ dev-servo mailing list dev-servo@lists.mozilla.org https://lists.mozilla.org/listinfo/dev-servo
