GoThere

A streamlined travel planning web application

onboarding

1. clone the project repo

git clone https://github.com/hratx-blue-ocean/GoThere.git

2. Navigate to the GoThere/client

run npm install

git-workflow

Before beginning any work on new features, pull from the pre-production branch to update your local code to the most recent version:

1. switch to the pre-production branch

git checkout pre-production

2. Pull most recent commits

git pull origin pre-production

Create a new feature branch if needed

git checkout -b <new branch name>

otherwise

Switch to the feature branch

git checkout <branch name>

4. Check the current branch you are on

git branch

5. Merges any changes pulled from the pre-production into the feature branch

git rebase pre-production <feature branch>

6. Do all of your work on your feature branches
7. When you are ready to save changes, commit and push to the branch.

git add
git commit
git push origin <branch-name>

pull requests

1. When you are ready to merge your feature branch to the pre-production branch, open a pull request
2. Be sure to pull into the base repository/pre-production branch from the correct feature branch

base : pre-production from compare : feature-branch

• Include the ticket number in the pull request body
• Tag a team member in a comment for review before merging

3. When the pull request is approved, merge the pull request
4. Then, add the new changes to your local repo:

 git checkout pre-production
 git pull origin pre-production

5. witch back to whatever branch you were working on

git checkout <branch name>
git rebase pre-production <branch name>