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
-
-
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
-
never squash i want beautiful long commit chains, like a chain of knowledge or of daisies or some such
-
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 more reply
New conversation -
-
-
What I almost always rebase. Continuous linear history is really nice if you can pull it off. It often depends on project scale and complexity, though.
- End of conversation
New conversation -
-
-
Me: I `git rebase -i` before I push so I can reorder commits to put bugfixes before functional changes. Github: I show commits in date order, not DAG order. Me: *weeps*
Thanks. Twitter will use this to make your timeline better. UndoUndo
-
-
-
Thanks. Twitter will use this to make your timeline better. UndoUndo
-
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.