Repository navigation
New ocabot merge option: autosquash? #86
Description
Following the discussion here: #75, and specifically this clarification: #75 (comment).
Personally, when I first red that the bot was going to autosquash commits I loved the feature as I prefer to add fixup commits to have clear diffs as you attends review or do changes. For me, rely on the force push diff is not ideal. Then today I found that it was not actually working and the merge strategy is a different one, so this issue raises the question: is it worth/useful to implement such an option? something like ocabot merge autosquash.
Activity
pedrobaeza commentedon Oct 22, 2019
@lreficent what is the problem querying "Forced push" link in GitHub for reviewing differences?
LoisRForgeFlow commentedon Oct 22, 2019
@pedrobaeza if you force push several times in a row you lose the diff. I know it is nitpicking that's why I wonder if the feature is really valuable.
pedrobaeza commentedon Oct 22, 2019
Yeah, that's the only limitation for now, that GitHub groups them together and don't show full diff, but I think we must report that to GitHub for being fixed instead of using other techniques.
[-]New command autosquash?[/-][+]New ocabot merge option: autosquash?[/+]sbidoul commentedon Oct 31, 2019
See also #43
hparfr commentedon Dec 7, 2021
Hi 2019!
End of 2021 here and GitHub has improved a little on forced branch but not so much. After a force push, links from (email) notifications are still broken and it's still difficult to figure out what where changed during second review.
Git already have all the tools to fix it from a while.
From a user point of view.
git commit --fixup HEADis easier thangit rebase 14.0A short help message can be added to the output of pre-commit on the oca CI:
"Run pre-commit on your machine then commit with
git commit --fixup HEAD"In order to ease the transition, I suggest, to allow it as an opt-in :
ocabot merge minor autosquashAnd if there is some conflicts, it can still be fixed the old way: rebase locally.