05-19-2016, 10:02 PM
In my opinion, merge commits can make the history very, very tangled and difficult to read, especially if attempting to bisect the history for a regression etc. Rebasing makes the history much more concise.
A mix of squash-merges and rebase-merges is probably the best solution for now.
A mix of squash-merges and rebase-merges is probably the best solution for now.