@Théo Zimmermann we use coqbot in math-comp github PR, I think the only thing it does is to add the label "needs: rebase" sometimes. Can we use it to say "@coqbot: rebase now", in order to rebase a PR which has a potentially trivial rebase?
(I often just do
git checkout X; git pull --rebase upstream master; git push -f origin X)
In principle, coqbot doesn't add the
needs: rebase label when there are conflicts that can be auto-solved. Is this because your git config has some additional parameters that make some conflicts be solved automatically?
union strategy for
I'm not very concerned about the "needs: rebase" but I'd like to stop being the limiting factor for rebasing my own pull-requests
hence the question about coqbot powers
I'm surprised coqbot didn't pick this strategy automatically from the
You wrote "Github does not support this yet though" in your PR introducing it. Does this mean that one needs some particular version of
git or some local
git configuration in addition for this to work?
Nop, it just means github does not read this attribute.
Cyril Cohen said:
FTR I just merged https://github.com/math-comp/math-comp/pull/551.
It does not solve conflicts on github yet (cf https://github.com/isaacs/github/issues/487 and https://github.com/isaacs/github/issues/560, so it's likely to be supported in the future, given gitlab does... hopefully).
However, locally, I tested it on a few
git rebasethat would conflict, and it does not anymore. :tada: :tada:
FTR, it's totally possible to grant a "rebase now" feature request. It's just that I'm trying to figure out why the
.gitattributes option is not already used when doing the
git merge. Is this supposed to work only when using
git rebase? coqbot does the
git merge on the comand-line.
@Théo Zimmermann I think
git merge reads it as well, but we should not dare to ask @coqbot to merge with a CI not running because github does not detect the spuriousness of the conflict.
The purpose of
@coqbot: rebase now would be to rebase and trigger the CI again without having to checkout locally etc
OK. Please open an issue on https://github.com/coq/bot so that I remember to implement this.
Last updated: Feb 09 2023 at 02:02 UTC