search

ppyordanov / Dynamic-Noise-and-Pollution-Map

A dynamically generated University of Glasgow noise and pollution campus map via the innovative Smart Citizen Kit developed in Barcelona, Spain by FabLab.
0 stars 0 forks source link

Git Rebase #42

Closed ppyordanov closed 9 years ago

ppyordanov commented 9 years ago

Issue rebasing branches, wrong branch name.

ppyordanov commented 9 years ago

SOLVED.

Some commits were reverted/ lost, but I managed to restore the previous state of _db/mysql_ and tested it. After that _db/mongo_ merged on _dev_ using the _ours_ strategy.