oh no i do this all the time i'm the problem
-
-
-
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 4 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
anyway none of this crap matters because github will squash PR branches before merging into master
1 reply 0 retweets 0 likes -
not necessarily
1 reply 0 retweets 0 likes -
yeah you have to ticky tick box
1 reply 0 retweets 1 like
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.