michael-o commented on issue #55: Fix for SCM-805 URL: https://github.com/apache/maven-scm/pull/55#issuecomment-395679438 I see six commits with merge commits. I get a merge conflict on a local branch. Are you certain?
---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services