[Exist-development] [HEADS-UP] Revert/Rebase

[Adam R. <ad...@ex...>]

Just a heads-up to let you know that we have undone the latest merge
to the 'develop' branch as we discovered that there were conflicts in
revisions making up the commit. You won't see a merge as this was done
using `git reset`.

So if you have your own fork of 'develop' and/or branches based on
'develop' with your commits based on (i.e. after) af2fe83 (11 days
ago) then you may need to reabse locally. The 'develop' branch has
been reset to ac160ba.

If your own clone branch ('develop' or otherwise) was not past commit
ac160ba before you started making changes (if any), then you can
safely ignore this email.

Otherwise, if you were until now completely up to date, then you can
use the command `git rebase --onto` whilst on your branch to get back
in sync. Obviously, please make a backup of your local clone before
attempting this, and then check the results locally using `git log`,
and for more details of how to rebase onto, see:
http://pivotallabs.com/git-rebase-onto/.

Any questions, about adjusting your fork/clone branches, please just
ask, I would like this to be as painless for everyone as possible.

Cheers Adam.

-- 
Adam Retter

eXist Developer
{ United Kingdom }
ad...@ex...
irc://irc.freenode.net/existdb