jkesselm commented on PR #14: URL: https://github.com/apache/xalan-java/pull/14#issuecomment-1764736316
When I try to perform the above operations (including the first box), the git merge tells me ``` hint: Diverging branches can't be fast-forwarded, you need to either: hint: hint: git merge --no-ff hint: hint: or: hint: hint: git rebase hint: hint: Disable this message with "git config advice.diverging false" ``` Disabling the message only disables the hint message; it does not resolve the "not possible to fast-forward" complaint. What needs to be changed to make this work as intended? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@xalan.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@xalan.apache.org For additional commands, e-mail: dev-h...@xalan.apache.org
