Contributors mailing list archives
Re: Merge/squash commits in pull requestsby
Agile Business Group, Lorenzo Battistini
On 19 January 2017 at 12:08, Jordi Ballester Alomar <email@example.com> wrote:
Dear community members,We have created a wiki page in OCA/maintainer-tools that provides some guidance in merging/squashing commits in preparation for merging a pull request into OCA repositories.We hope that this can make it easier for all to know how to address the task when required.Please no not hesitate to send feedback!
Thanks Jordi, this is very useful.
The page talks about squash but it then uses fixup. In general I would use squash, except when squashing OCA Transbot commits, where I would use fixup.
Then, at the end of the guide, I would add
git push -f
to make clear that history has to be overwritten