Stay in Sync with Base Repository

##How to stay in Sync with the Base repository (appteam nith festnumbus)

1. Add upstream remote handle

   git remote add upstream https://github.com/appteam-nith/festnimbus.git

2. Track the repository through github.com or slack if you are in the group. (mail at [email protected] if you wish to be added)

   Alternatively

   git pull upstream master

   And see if your branch is up to date with upstream master

3. If you were making some changes or any error occurs, stash your changes

   git stash

4. Now try pulling from upstream again

   git pull upstream master

5. Now push this updated code to your forked repo

   git push origin master or git push origin master -f (forcefully if errors)

6. Now pop your stashed code and start working

   git stash pop

7. Solve the conflicts (if any) and after work is done push to your repo and create pull request as explained above.