2015-02-04 (Wednesday)

@russelldavies I keep telling you, I don't have time to start another blog Russell!

@Zoonie The email I just linked to?

Whenever anyone refers to permalinks (which, admittedly, might only be me these days) I'll interrupt with "ha, *so-called* permalinks!!!".

@Zoonie He's fine with harnessing the power of the internet masses for his fights against the man though isn't he, eh?

Great email from Stewart Lee about ticket touts: stewartlee.co.uk/latestnews.php (PS, why does Stewart Lee hate so-called permalinks?)

@joelchippindale @tomstuart I think I just like inflexible authoritarian tools that you can only use one way. Not very fashionable.

@joelchippindale @tomstuart (Seems like a good description though, generally.)

@joelchippindale @tomstuart And yet that suggests that often you want to merge, not rebase.

@joelchippindale @tomstuart For rebasing (say) master on your feature branch? And/or putting feature branch changes into master at the end?

@tomstuart See! SEE!

@tomstuart Yeah, it'll probably be fine. I'd just like to understand enough to make a decision more meaningful than "oh, whatever."

@tomstuart Are there any reckons for small teams with small problems?

@tomstuart But I think I should care. But everyone assumes their way is the only way and don't explain the differences. #computers

@tomstuart I'm just going to make an alias that randomly chooses whether to do `rebase` or `merge`. Should be fine. ☑️

I have read approximately a bazillion definitive best ever example git workflows and they are all different.

@infovore @Afterthefloodco Ooh, yes, that scroll reveal on the home page is lovely. It's just enough.