search

BerkeleyAutomation / malasakit

Malasakit is a customizable participatory assessment platform that collects and integrates quantitative assessment, qualitative feedback, and peer-to-peer collaborative filtering on ways local communities can become better prepared for typhoons and floods.
2 stars 8 forks source link

Updated ASR models and decoding scripts #162

Closed MSimora closed 6 years ago

MSimora commented 6 years ago

Issues: Needs to calibrate confidence scoring

jonathan-j-lee commented 6 years ago

My apologies--I forgot that when forking this repository, BerkeleyAutomation/malasakit-v1 is not origin (origin would be MSimora/malasakit-v1), so git pull origin master won't pull changes from this repository into your fork.

In the future, use 

git remote add upstream https://github.com/BerkeleyAutomation/malasakit-v1.git

to set BerkeleyAutomation/malasakit-v1 as the original repository you forked from, then run git pull upstream master to pull into your fork.

I've resolved outstanding merge conflicts by preferring your fork's code over this repository's.