Comments by "Brent Jacobs" (@br3nto) on "You only Git Merge?!? feat Theo : DevHour #1" video.

  1. He’s talking about rebasing that leads to force push to shared branches on remote… theres no excuses to not rebase local and transient branches. Not rebasing means that the conflicts have to be put in the merge commit, whereas rebasing ensures the conflicts are resolved in the commits that introduces the conflict. The specific problem he had that lead to his fear of rebase is not a git issue, but a problem inherent in long lived branches. They always diverge and eventually be some incompatible with other long lived branches. So, of course rebase didn’t work because what they actually needed was a rewrite. He just falsely attributed the problem to git and more specifically rebasing.
    1