Skip to content
This repository was archived by the owner on Sep 3, 2021. It is now read-only.

Commit 6f60b76

Browse files
committed
docs(deliverable-instructions): clarify deliverable instructions
1 parent 8d83392 commit 6f60b76

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

README.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,14 @@ This project represents a challenge to test your git flow, programming, and trou
44
## Challenge Instructions
55
You will begin by creating a fork of this repository to your own Github account. All work will be completed and reviewed within your own fork. Please do not create a Pull Request (PR) back into this repository.
66

7-
Once you have created your fork, review the Issues labeled `challenge task` [HERE](https://github.com/Shift3/react-challenge-project/issues?q=is%3Aissue+is%3Aopen+label%3A%22challenge+task%22). Work on each task in a new branch. Once the work is completed, create a Pull Request from the working branch to your `master` branch and reference the Issue you are working on. These open PRs will be the final submission which Shift3 will review.
7+
Once you have created your fork, review the Issues labeled `challenge task` [HERE](https://github.com/Shift3/react-challenge-project/issues?q=is%3Aissue+is%3Aopen+label%3A%22challenge+task%22). Shift3's standard for branching is as follows:
8+
9+
- Maintain a `master` and development (`dev`) branch on the repository
10+
- For each new feature (issue), create a branch based off of your `dev` branch
11+
- Once your feature has been completed, submit a Pull Request from your feature branch to your `dev` branch
12+
- If you have a reviewer on your repository, once your Pull Request has been approved, merge your feature branch back into `dev`
13+
- Otherwise, submit the Pull Request and merge it into your `dev` branch
14+
- Once the work has been completed, create a Pull Request from the working branch to your `master` branch and reference the Issue you are working on. These open PRs will be the final submission which Shift3 will review.
815

916
Once you are ready to submit your work, send an email to your Shift3 contact with a link to your fork.
1017

0 commit comments

Comments
 (0)