CLOSED - Giving potential applicants a view into the Volunteer opportunities available, along with additional data to make an informed decision to join Peace Corps.
Open your Google app engine, selecting the File menu, Add Existing Application...
Select your updated Opportunity-Portal folder
Run, and Browse your website
Workflow of git and feature branch
Create a new branchgit branch your_branch_name
You can create as many branch as you like, but they are not going repository until you push it
Switch to different branchgit checkout your_branch_nameSwitch back to master branchgit checkout master
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 masterWhat 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.
Merge your branch result to mastergit checkout master switch to master branch
git merge your_branch_namegit push
Delete your branch (Optional, you can keep working on your feature branch or open a new one)git branch -d your_branch_name
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..
Workflow of git and feature branch
git branch your_branch_name
You can create as many branch as you like, but they are not going repository until you push itgit checkout your_branch_name
Switch back to master branchgit checkout master
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 typegit 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.git checkout master
switch to master branchgit merge your_branch_name
git push
git branch -d your_branch_name