Alfanous-team / alfanous

Alfanous is an Arabic search engine API provides the simple and advanced search in Quran , more features and many interfaces...
http://www.alfanous.org/
GNU Affero General Public License v3.0
254 stars 89 forks source link

Server version (#483) #484

Closed assem-ch closed 6 years ago

sneetsher commented 6 years ago

@assem-ch what's going on, merging back same changes?

then deploy anyone of them using a symbolic link, so we can test and switch back quickly if it's broken.

assem-ch commented 6 years ago

@sneetsher the server version should be merged on master... through the years of inactivity i made some small fixes on server directly

You can install different version in server just by running python scripts/update.py dev1/

sneetsher commented 6 years ago

Ok avoid using git for this, it is not intended for this. (It uses the hashes to compare files & commits).

Make manual merge using meld which provide folder recursive diff. I mean to compare master & server with one level depth history.

Apply changes to master and delete server. So we can keep track of it with clean merges

assem-ch commented 6 years ago

yes sure, server_version is temporary