These are chat archives for ushahidi/Community
Hi @CarolynCommons @ushbot
I have not tried.
The commands I usually use to do the update are:
1.- git pull
2.- npm install
3.- gulp build
what should I do? replace the command 1 by?:
1.- git fetch origin
2.- git merge origin/master
Our changes have been only in the CSS. That's why I have commented about the changes on components names, id, and structure.
git pullon master branch. This will merge all of the updates into your branch. Wherever there are conflicts, you will need to resolve those. if you realize that it is going to be too difficult to merge the updates into your codebase, you can run
git reset --hardwhich will revert your master branch to the commit before you merged.