XSF Editor Team - 2017-11-29

  1. jonasw

    Guus, confirmed, the chained xeplist rebuild works :)

  2. Guus


  3. jonasw

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

  4. SamWhited

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

  5. jonasw

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

  6. jonasw

    build is still running though

  7. jonasw

    also, you forgot to actually change the Status

  8. SamWhited


  9. jonasw

    will do that, push the fix and cancel the build

  10. jonasw

    I have some tooling updates I want to push anyways

  11. SamWhited

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

  12. SamWhited

    thanks for the fix

  13. jonasw

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

  14. SamWhited

    oh crap, I've been forgetting to do that

  15. SamWhited


  16. peter

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

  17. peter

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

  18. peter

    any suggestions for doing a better job of this?

  19. jonasw

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

  20. peter

    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.

  21. jonasw

    hmm, could be tricky to resolve

  22. jonasw

    depending on what changed

  23. peter


  24. jonasw

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

  25. jonasw

    it’ll end up in a merge state

  26. peter

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

  27. jonasw

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

  28. jonasw

    or that :)

  29. peter

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

  30. peter

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

  31. peter

    jonasw: noted on change process

  32. peter

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

  33. SamWhited

    Fantastic; thanks! I'll get those merged shortly

  34. peter

    It sure took me long enough.

  35. peter

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