Rebase, merge or squash, which should I use?

Hi guys, in a git talk I gave, one of the questions that generated the most discussion was, when should I use merge,…

Read more