jonaswGuus, confirmed, the chained xeplist rebuild works :)
jonaswSamWhited, I see you did things. If you want I can send out the mails automatedly
SamWhitedjonasw: that would be great, I was waiting on the build to finish but haven't gone back to check on it yet
jonaswsending out mails is trivial for me, you can ping me whenever you need that
jonaswbuild is still running though
jonaswalso, you forgot to actually change the Status
jonaswwill do that, push the fix and cancel the build
jonaswI have some tooling updates I want to push anyways
SamWhitedI even built them to manually check that they looked okay and apparently didn't notice
SamWhitedthanks for the fix
jonaswalso, I’ll push the new versions to the attic
SamWhitedoh crap, I've been forgetting to do that
peterhmph, my forked repo is all screwed up - maybe it's better to start over...
peteror: maybe I still don't understand git...
peterany suggestions for doing a better job of this?
jonaswdunno, what have you tried and what doesn’t work?
peterIt 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.
jonaswhmm, could be tricky to resolve
jonaswdepending on what changed
jonaswif you’re comfortable resolving a merge conflict, you can simply git pull
jonaswit’ll end up in a merge state
peterI'm going to destroy the fork and start over. Again. :-)
jonasw(if you’re working on your own branch, you want to do git checkout master && git pull && git checkout yourbranch && git merge master)
jonaswor that :)
peterIt's too messy and I don't want to leave you and Sam with a mess of merges.