If you are returning to work on WebApp and other developers have made changes, follow these steps.
Update WeVoteServer first (the code that powers the Django/Python API Endpoints). See instructions here
Grab the latest code from https://github.com/wevote/WebApp
Activate the virtual environment:
$ cd /Users/<YOUR NAME HERE>/NodeEnvironments/WebAppEnv/
$ . bin/activate
Install changes and start web application
(WebAppEnv) $ cd /Users/<YOUR NAME HERE>/MyProjects/WebApp
(WebAppEnv) $ npm install
(WebAppEnv) $ npm start
You should be able to visit WebApp here:
http://localhost:3000
The process of stashing code and unstashing code (including dealing with merge conflicts) is much easier if you use an IDE (Integrated Development Environment) like PyCharm Community Edition. This is how you can do it from the command line.
Ctrl-C to stop npm from running. Then:
(WebAppEnv) $ git stash save "my_branch_20170101" # Set aside your current work locally
(WebAppEnv) $ git branch -a # See what branch you are currently set to (look for "*" on left of listing)
(WebAppEnv) $ git checkout develop # If you aren’t set to the develop branch, switch to that
(WebAppEnv) $ git pull upstream develop # Tell your personal fork on your local machine to get the latest from wevote/WebApp
(WebAppEnv) $ git push origin develop # Push this latest version of develop up to your Personal Fork on the github servers
(WebAppEnv) $ git checkout -b <your-feature-branch> # Create a new branch with the name you want to use for your pull request
(WebAppEnv) $ git stash list # Remind yourself the stash name you used
(WebAppEnv) $ git stash apply stash^{/my_branch_20170101} # Apply your stashed code on top of the latest develop branch
Restart web application
(WebAppEnv) $ npm install
(WebAppEnv) $ npm start
We have created this diagram to show the typical flow when preparing a pull request.
Next: Debugging Tools and Tips