afs commented on PR #2501: URL: https://github.com/apache/jena/pull/2501#issuecomment-2308989592
ASF now have a Software Grant for this PR. "rebase and merge" and "merge commit" show conflicts. "Squash + merge" is showing as OK. Taking a diff and applying it (a sort of cheap and hacky "squash") is no longer working - in part, due to some early RDF 1.2 work :-) The Apache Jena `main` branch is protected - it does not allow forced pushes or uncommitting. Code needs to be finished and clean to put onto `main`. I've created a new branch in the Jena repo `gh2518-cdt` which is the current state of `main` (2024-08-25) and changed the merge target of this PR branch to that branch (and "merge commit" has gone green which is strange). My plan is to squash-merge onto that new branch and see what the state is and we can all test it out. It may take more then one attempt to get this integrated. @hartig - Please treat `hartig:UnfoldAndFoldWithCompositeValues` as frozen. If you want to make changes, clone of that branch in your repo. Don't throw away your copy! -- 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: pr-unsubscr...@jena.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: pr-unsubscr...@jena.apache.org For additional commands, e-mail: pr-h...@jena.apache.org
