Getting Started with Django on GAE

[jkevintu]

Set up Python and Google app engine environment

Here is the guide of how you can set up your local environment to run our project in google app engine..

1. Download and install Python 2.7 https://www.python.org/download/releases/2.7
2. Download and install Google app engine SDK for python https://developers.google.com/appengine/downloads#Google_App_Engine_SDK_for_Python
3. Open your Google app engine, selecting the File menu, Add Existing Application... Select your updated Opportunity-Portal folder
4. Run, and Browse your website

   Workflow of git and feature branch

5. Create a new branch git branch your_branch_name You can create as many branch as you like, but they are not going repository until you push it
6. Switch to different branch git checkout your_branch_name Switch back to master branch git checkout master
7. How do I code and commit on my feature branch? Same way as your master branch git add, git commit, git push .... etc I want to keep update my feature branch latest with master branch. git rebase master What if I have conflict files? when I type git status it says both modified Edit your conflict file and delete text insert by git such as <<<<<<< HEAD or ======= or >>>>>>> test after cleanup, git add your_conflict_file then commit and push it.
8. Merge your branch result to master git checkout master switch to master branch git merge your_branch_name git push
9. Delete your branch (Optional, you can keep working on your feature branch or open a new one) git branch -d your_branch_name