afs commented on PR #2501: URL: https://github.com/apache/jena/pull/2501#issuecomment-2149749093
> @afs I am done with rebasing now. Excellent. If set to "Rebase and Merge" there is something showing. 148 commits in (commit 9cc5647c3c). Part of the conflict is ``` both added: jena-arq/src/main/java/org/apache/jena/sparql/syntax/ElementUnfold.java ``` which suggests both parts are for this PR. Several I looked at are the same update, very similar via two different routes. The other github merge strategies do allow merge although it does not guarantee git will pick the right option. It doesn't like a "semantic" (!!) problem -- I'll investigate further. -- 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: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
