I think I'm starting to understand branches in git? This takes me one step closer to having a passable mental model of how git works
-
-
[foreboding music plays]
-
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""")
-
oh no i do this all the time i'm the problem
-
it's ok to rebase your branch before merging tho
-
no just merge the base branch up to your branch then merge back down
-
im talking rebase squash, you should already be up to date with the base branch before merging
-
squash SQUASH you are saying SQUASH in MY MENTIONS
- 3 more replies
New conversation -
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.