2

git rebase >>> git pull/git merge

Comments
  • 0
    Aren't there appropriate times to use one or the other?
    From what I understand don't rebase a public branch onto something?
  • 0
    @Dummybugger there are use-cases for each but in my workflow, 9/10 times rebase is way better/easier
  • 0
    Rebase does fuck with the commit log tho, and you wont be able to revert it as easily as a simple merge commit.

    May I ask what kind of project it is?
  • 0
    @RicoNijeboer it's a webapp with lots of bad legacy code that's slowly being updated
Add Comment