Skip to content

Merging dev: updates to readme #79

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 6, 2020
Merged

Merging dev: updates to readme #79

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7cad802
Merge pull request #69 from Shift3/master
coreyshuman Aug 25, 2020
1620e64
docs(readme): clarify some common issues we've had with applicants
coreyshuman Oct 6, 2020
cc596ba
Merge pull request #78 from Shift3/cts-clarify-gitflow
coreyshuman Oct 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,12 @@ You will begin by creating a fork of this repository to your own Github account.
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:

- Maintain a `master` and development (`dev`) branch on your fork
- For each new feature (issue), create a branch based off of your `dev` branch
- Once your feature has been completed, submit a Pull Request from your feature branch to your `dev` branch
- If you have a reviewer on your repository, once your Pull Request has been approved, merge your feature branch back into `dev`
- Otherwise, submit the Pull Request and merge it into your `dev` branch
- 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.
- For each feature/task (Issue), create a new branch based off of your `dev` branch
- Once a task 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.**

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

Please apply the following Shift3 Standard Practices as you work on this project:
**Please apply the following Shift3 Standard Practices as you work on this project:**
- Each unit of work (Issue) should be completed within its own [branch](https://github.com/Shift3/standards-and-practices/blob/master/standards/branching.md).
- Use Karma-style formatting for your [Git Commit Messages](https://github.com/Shift3/standards-and-practices/blob/master/standards/commits.md).
- Generate a PR for each unit of work (Issue) which is completed. Keep the scope of these PRs as narrow as possible. Try not to create PRs which rely on or contain code from previous PRs unless there is truly a dependency between the two units of work.
Expand Down