From: Adam R. <ad...@ex...> - 2015-06-29 13:57:06
|
That took slightly longer than expected, but the Git repo is now back in good order and open for business again. Sorry for the issues. If you have a clone of the eXist GitHub repo and your `develop` (or other derivative branches) and you pulled or rebased since Friday 26th June 2015, then you I am afraid will most likely need to rebase or reset your HEAD to wipe out the issues that were introduced. If you did not update since Friday 26th June, then you are probably just fine and can do a pull or fetch/rebase just fine again. Thanks Adam. On 28 June 2015 at 20:05, Adam Retter <ad...@ex...> wrote: > I have repaired much of the commit history and for now my repaired > copy is available here - > https://github.com/adamretter/exist/commits/develop > > I am afraid that to proceed and finish the job though I have a couple > of different approaches that I could take. This needs to be discussed > with the rest of the core development team to get an agreement. > However, the crux of the matter is that removing a file from our > repository history will cause problems with existing open > pull-requests and any other branch or cloned repo. > > There are a few ways we could proceed. When the other core developers > appear again (tomorrow now I guess), then we will resolve this ASAP. > > For the moment, please consider the repo still frozen. Sorry for the > delay, and thank you for your patience. > > I will issue another update tomorrow AM (UTC). > > Adam. > > On 27 June 2015 at 22:49, Adam Retter <ad...@ex...> wrote: >> Hi eXist developers, >> >> For the moment, we think we may have a problem with our GitHub Git >> repository. Can I please ask people to avoid sending or merging any >> pull-requests for the next 12 hours or so. >> >> Unfortunately I am traveling at the moment, but I will be able to look >> at repairing the repository from about 12pm UTC tomorrow (Sunday 27th >> June). It should only take me about 1 - 2 hours. I will send a further >> update after that time. >> >> Also for your own sanity, I would suggest not doing a pull or fetch >> from the eXist GitHub repository at the moment. >> >> Thanks for your patience. Adam. >> >> -- >> Adam Retter >> >> eXist Developer >> { United Kingdom } >> ad...@ex... >> irc://irc.freenode.net/existdb > > > > -- > Adam Retter > > eXist Developer > { United Kingdom } > ad...@ex... > irc://irc.freenode.net/existdb -- Adam Retter eXist Developer { United Kingdom } ad...@ex... irc://irc.freenode.net/existdb |