theit commented on issue #55: Fix for SCM-805 URL: https://github.com/apache/maven-scm/pull/55#issuecomment-395680398 Very strange. I followed the documentation in [1] to sync my fork with the upstream Apache maven-scm repository, merged the master branch into my local master and then into the SCM-805 branch... May I ask where do you get these merge conflicts? [1] https://help.github.com/articles/syncing-a-fork/
---------------------------------------------------------------- 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
