XSF Editor Team - 2017-11-29

Guus, confirmed, the chained xeplist rebuild works :)

\o/

SamWhited, I see you did things. If you want I can send out the mails automatedly

jonasw: that would be great, I was waiting on the build to finish but haven't gone back to check on it yet

sending out mails is trivial for me, you can ping me whenever you need that

build is still running though

also, you forgot to actually change the Status

*facepalm*

will do that, push the fix and cancel the build

I have some tooling updates I want to push anyways

I even built them to manually check that they looked okay and apparently didn't notice

thanks for the fix

also, I’ll push the new versions to the attic

oh crap, I've been forgetting to do that

thanks

hmph, my forked repo is all screwed up - maybe it's better to start over...

or: maybe I still don't understand git...

any suggestions for doing a better job of this?

dunno, what have you tried and what doesn’t work?

It seems that I make some changes in a branch and then don't keep the fork in sync, so I get way behind but I have a few check-ins that are ahead locally. I think what I need to do is be more disciplined about completing the work that I start.

hmm, could be tricky to resolve

depending on what changed

exactly

if you’re comfortable resolving a merge conflict, you can simply git pull

it’ll end up in a merge state

I'm going to destroy the fork and start over. Again. :-)

(if you’re working on your own branch, you want to do git checkout master && git pull && git checkout yourbranch && git merge master)

or that :)

It's too messy and I don't want to leave you and Sam with a mess of merges.

XEP-0186 fixes complete: https://github.com/xsf/xeps/pull/550

jonasw: noted on change process

It's amusing to sign the CLA agreement, given that I wrote the policy. :-)

Fantastic; thanks! I'll get those merged shortly

It sure took me long enough.

I still need to find time for finishing those Jingle fixes.