oh no
-
-
Replying to @sonyasupposedly @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 16 likes -
Replying to @chaosprime @sonyaellenmann
oh no i do this all the time i'm the problem
2 replies 0 retweets 3 likes -
my flowchart is to git rebase, and if ANY merge conflicts arise, run far away, git rebase --abort, and git merge
1 reply 0 retweets 3 likes -
unsure if cowardice or healthy degree of self preservation anyway i use git tower which is a GRAPHICAL USER INTERFACE which makes interactive rebase not scary, i.e. it gives users a false sense of security and increases the likelihood of absolutely insane blowup
1 reply 0 retweets 3 likes -
imo it's just the correct choice since the rebase algo has an unnecessarily worse problem to solve and merge can make better decisions
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.