Mike MacgirvinMike Macgirvin wrote the following post Fri, 05 Oct 2018 15:36:43 +1000
The Zap and Zap-addons repositories are now gone. The Zap and Osada projects are merged.

No action needs to be taken for Osada servers, but you might pull in the latest changes; there have been a fair number of fixes

Here's what you need to do to update your Zap server without creating merge conflicts:

You should have already added


define('NOMADIC',1);


to your .htconfig.php file. If you haven't done this, do it now.


cd {{your zap server directory}}

# fix the config link
git remote set-url origin https://framagit.org/macgirvin/osada.git

git checkout master
git fetch origin master
git reset --hard FETCH_HEAD

git checkout dev
git fetch origin dev
git reset --hard FETCH_HEAD

git checkout {{master or dev, whichever branch you want to run}}


Next change to your addons directory and repeat the above but change the repository link


cd extend/addon/{{whatever you named the addons}}

# fix the config link
git remote set-url origin https://framagit.org/macgirvin/osada-addons.git

git checkout master
git fetch origin master
git reset --hard FETCH_HEAD

git checkout dev
git fetch origin dev
git reset --hard FETCH_HEAD

git checkout {{master or dev, whichever branch you want to run}}