On 13-09-16 13:57, Peter wrote:
I don't have strong feelings about it, I have heard that git history isn't as good as svn, but merge is much better. I know we've had merge issues in the past with svn, but I haven't experienced history issues with git yet.
dont overestimate the power of git rebase : https://git-scm.com/book/en/v2/Git-Branching-Rebasing#The-Perils-of-Rebasing G. Simon
