You are viewing a plain text version of this content. The canonical link for it is here.

Posted to dev@cloudstack.apache.org by Rohit Yadav <ro...@shapeblue.com> on 2016/08/16 18:35:19 UTC

[DISCUSS] Using Github's squash merge to close pull request?

All,


I found that Github also allows to merge a PR with the changes squashed [1], our git-pr script uses a normal branch-merge pattern. Should we evaluate using the approach of squash-merging a PR [1] to reduce git-history clutter?


Github also (finally) allows to edit a PR and change base branch, so several old PRs can be edited to change base branch to 4.9 (wherever applicable)[2]. So, if you've a old PR that is still pending please consider editing the base branch to 4.7-4.9 wherever applicable.



[1] https://help.github.com/articles/about-pull-request-merge-squashing/

[2] https://github.com/blog/2224-change-the-base-branch-of-a-pull-request

Regards.

rohit.yadav@shapeblue.com 
www.shapeblue.com
53 Chandos Place, Covent Garden, London  WC2N 4HSUK
@shapeblue