3 ms·
I got to "There are those who say you should never rebase as a form of simplifying git" and had to exert a lot of self control not to shout "YOU CAN PRY GIT REB
by krinchan 8y ago
I got to "There are those who say you should never rebase as a form of simplifying git" and had to exert a lot of self control not to shout "YOU CAN PRY GIT REBASE INTERACTIVE OUT OF MY COLD DEAD HANDS!!"
I don't understand how anyone can live without rebasing their branch on master so their PR is a fast-forward merge and squashing their 4 days of WIP and Changing Computers commits into one sane commit.
Let's not even mention the fact that they introduce all those in-between commits where your unit testing is broken.
Our team has a very strict rule that every commit on master has passing unit tests and all merges to master (within reason) are fast-forward merges. We also allow force pushing to your feature branch to encourage using git as a decent backup for your WIP and eventually the cleanup before merging. As such, newbies get taught the basic rebase commands. This requires talking about the underlying model of git.