-
Kev
I don't think we even squash on merge.
-
tmolitor
but you could (I remember jonas doing this in the past).
-
tmolitor
I guess I'll squash it myself and force push the update...
-
tmolitor
done
-
Kev
Thanks.
-
tmolitor
no problem, I just needed to know what you wanted :)
-
jonas’
no, I never squashed
-
jonas’
nor do I endorse squashing
-
tmolitor
well you squashed at least once, if I recall correctly...but well...doesn't really matter, I guess...
-
jonas’
don't confuse squash with "please clean up your commit history" ;-)
-
tmolitor
isn't that in most cases more or less the same? ;)
-
jonas’
no :-)
-
Kev
On the other hand, I'm a big fan of squashing appropriately, and think merge commits are largely evil :D
-
moparisthebest
I have a proposal to get rid of manual attic management by just avoiding merges and only allowing single-commit-PRs (which you could do by policy or squashing) but no one has commented on it yet :) (in the tooling issue)
-
tmolitor
I cleaned up the XEP-0388 commit history in PR1214, too...should be ready to merge now :)
-
tmolitor
(I squashed everything into one commit)
-
tmolitor
only thing that confuses me: > [FAIL] XPATH value /xep/header/approver/text() ('') does not equals 'Board' or 'Council' (but should).
-
tmolitor
should I add an approver in my PR?
-
larma
tmolitor, that's what I did for past PRs, makes editor's live slightly easier if you already do it for them I guess
-
tmolitor
Okay, last time I did this, Dave told me that this was wrong because experimental xeps don't need council to be updated...
-
tmolitor
larma: what value are you using?
-
larma
<approver>Council</approver>
-
larma
well, they don't need council for updates
-
larma
but they need council to be approved to stable 😀
-
Kev
It's not an approver in the sense of a person who has approved them, it's an approver as in the body that's responsible for the advancement of the XEP.
-
Kev
Assuming we're talking about what I think we're talking about.
-
moparisthebest
tmolitor, larma, Kev: I have a PR to add approver to all where it's missing, can it be merged?
-
Kev
When I'm not ill, I'll try to do another chunk of PR triages.
-
tmolitor
Well, i guess Dave was wrong then...the xep template needs to be updated, I guess
-
tmolitor
I'll do another force push to PR 1214 to add approver=council there...
-
tmolitor
PR 1214 is wrongly labeled by the way
-
moparisthebest
I also have a PR to automate labeling :(
-
tmolitor
those automation prs sound really helpful....but then again I'm not an editor anyways...
-
tmolitor
I've updated the XEP-0388 PR (1214) to include an approver and squashed everything into one single commit :)