Guus, confirmed, the chained xeplist rebuild works :)
Guus
\o/
Guushas left
Kevhas left
Kevhas joined
peterhas joined
peterhas left
peterhas joined
jcbrandhas left
SamWhitedhas left
SamWhitedhas left
Tobihas joined
jonaswhas left
soulhas left
soulhas joined
jonasw
SamWhited, I see you did things. If you want I can send out the mails automatedly
SamWhited
jonasw: that would be great, I was waiting on the build to finish but haven't gone back to check on it yet
jonasw
sending out mails is trivial for me, you can ping me whenever you need that
jonasw
build is still running though
jonasw
also, you forgot to actually change the Status
SamWhited
*facepalm*
jonasw
will do that, push the fix and cancel the build
jonasw
I have some tooling updates I want to push anyways
SamWhited
I even built them to manually check that they looked okay and apparently didn't notice
SamWhited
thanks for the fix
jonasw
also, I’ll push the new versions to the attic
Tobihas left
SamWhited
oh crap, I've been forgetting to do that
SamWhited
thanks
peter
hmph, my forked repo is all screwed up - maybe it's better to start over...
peter
or: maybe I still don't understand git...
peter
any suggestions for doing a better job of this?
jonasw
dunno, what have you tried and what doesn’t work?
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.
jonasw
hmm, could be tricky to resolve
jonasw
depending on what changed
peter
exactly
jonasw
if you’re comfortable resolving a merge conflict, you can simply git pull
jonasw
it’ll end up in a merge state
peter
I'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)
jonasw
or that :)
peter
It's too messy and I don't want to leave you and Sam with a mess of merges.