Sounds like good advise, only rebase locally, never rebase anything that's been pushed.
Are the consequences of not heeding this advise what you experienced? Regards, Peter. Sent from my Samsung device. Include original message ---- Original message ---- From: Simon IJskes - QCG <si...@qcg.nl> Sent: 14/09/2016 06:17:27 pm To: dev@river.apache.org Subject: Re: Fwd: [jira] [Updated] (INFRA-12432) Apache River migration from SVN to Git - Git commit access 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