[foreboding music plays]
-
-
Replying to @sonyaellenmann
i kid, having a mental model of how git works is fine as long as you don't let it lead you into the path of self-destruction where you think you understand it well enough to do things like use rebase casually (like using rebase instead of merge because it's """nicer""")
4 replies 0 retweets 15 likes -
Replying to @chaosprime @sonyaellenmann
oh no i do this all the time i'm the problem
2 replies 0 retweets 3 likes -
-
it's ok to rebase your branch before merging tho
1 reply 0 retweets 0 likes -
no just merge the base branch up to your branch then merge back down
3 replies 0 retweets 3 likes -
im talking rebase squash, you should already be up to date with the base branch before merging
1 reply 0 retweets 0 likes -
squash SQUASH you are saying SQUASH in MY MENTIONS
2 replies 0 retweets 5 likes -
never squash i want beautiful long commit chains, like a chain of knowledge or of daisies or some such
3 replies 0 retweets 6 likes -
Replying to @djmicrobeads @chaosprime and
you guys say this, but i think you have never had to `git bisect` through a seemingly endless series of shit commits looking for an intermittently occurring concurrency race condition
1 reply 0 retweets 2 likes
that's true and i do feel that
Loading seems to be taking a while.
Twitter may be over capacity or experiencing a momentary hiccup. Try again or visit Twitter Status for more information.