Closed cpcloud closed 9 years ago
closes #17
this is passing on my travis runs: https://travis-ci.org/cpcloud/castra/builds/71074565
eh, upstream merges?
that's me merging master back in, instead of rebasing
i've pretty much abandoned rebasing in favor of merging, because personally i like to resolve merge conflicts once
yeah, I know the score.
try https://git-scm.com/docs/git-rerere (but yeah, I've stopped caring about what other people do :)
https://travis-ci.org/Blosc/castra <--travis hookup.
and now I need to run back into the shadows.
:smile:
closes #17