Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge bot: allow to squash commits of the PR #43

Open
pedrobaeza opened this issue Jun 17, 2019 · 4 comments
Open

merge bot: allow to squash commits of the PR #43

pedrobaeza opened this issue Jun 17, 2019 · 4 comments
Labels
Bot Task A task the bot does or should do enhancement New feature or request needs spec This issue is blocked due to lack of detailed specification

Comments

@pedrobaeza
Copy link
Member

Include a command for squashing the commits of the pull request independently from the fixup! message in them (not everyone makes this properly).

@pedrobaeza pedrobaeza mentioned this issue Jun 17, 2019
5 tasks
@sbidoul sbidoul added Bot Task A task the bot does or should do enhancement New feature or request labels Jun 17, 2019
@sbidoul sbidoul removed their assignment Jun 17, 2019
@sbidoul sbidoul added the needs spec This issue is blocked due to lack of detailed specification label Jun 30, 2019
@sbidoul
Copy link
Member

sbidoul commented Aug 6, 2019

Add an explicit option in ocabot merge command to request commit squashing.

Two options for the commit message:

  1. use the PR title + description (my preference)
  2. concatenate all commit messages

@simahawk
Copy link

would be nice to support:

  • autosquash - only for fixup! commits, preserve messages (eg: migration PR)
  • squash - squash them all, use PR title as main message

@guewen
Copy link
Member

guewen commented Jul 3, 2020

Maybe as a first step, could we have the bot refuses to merge if it finds any commit with fixup! and asking the contributor to squash? It could prevent having fixup commits merged such as in OCA/wms#32

@yajo
Copy link
Member

yajo commented Sep 13, 2023

@sbidoul a kind remainder about this issue. According to your last movements trying to improve the landing experience of functional people writing docs, this is gonna be a problem. They will probably not write correct commit message, or understand why they should (actually this happens with many devs too, after all...).

Maybe fixing this issue should land in your list of boxes to tick for that goal.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Bot Task A task the bot does or should do enhancement New feature or request needs spec This issue is blocked due to lack of detailed specification
Projects
None yet
Development

Successfully merging a pull request may close this issue.

5 participants