I've rebuilt the 3.5-dev branch as: https://github.com/apache/tinkerpop/tree/3.5-dev-rebuild
and I'm running the docker tests on it now but a preliminary build worked fine. It should have all the commits that 3.5-dev should have without the ones destined for master only. One caveat to that - Florian, I had a bit of trouble sorting through your dependabot merges. I assume dependabot will just create fresh PRs for you to merge when we force push this to 3.5-dev? you could just merge them in again? I'd like to quickly turn this around and get 3.5-dev operational again, so I will look to replace 3.5-dev with the git history of 3.5-dev-rebuild tomorrow and then do a no-op merge to master (specifically with "git merge 3.5-dev --strategy=ours" - I think that's the best way, if you know something better please let me know). I'd expect to send a quick note to dev to be ready for the change right before I do it and then it will be fixed. I see no reason to keep a backup of 3.5-dev as it's basically just a copy of master at this point. On Tue, Aug 31, 2021 at 11:25 AM Stephen Mallette <[email protected]> wrote: > Looks like 3.5-dev is suddenly even with master. No idea how/when that > happened. Trying to figure it out, but if anyone knows what might have gone > wrong, please yell. >
