syncing OF fork with local master, then merge with develop

gistfile1.txt

git fetch upstream
git checkout master
git merge upstream/master

git checkout develop
git merge upstream/master

// merge a branch into master
git checkout master
git pull origin master
git merge develop
git push origin master

// gitignore problems
git rm --cached myApps/*/*.xml

// more problems
git reset --hard origin/master
git reset --hard upstream/master