Last Updated: February 25, 2016
·
551
· Flavio Wuensche

Merging branches

Interesting tip by Jonathan Oliver. He recommends using git merge --no-ff so we can keep the context where the code was commited instead of just rebase & merge branches.

Better explained on his blog: http://goo.gl/j6BDr