Skip to content

Fix missing line breaks and typo in githubflow.md #556

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 2 commits into from
Aug 19, 2015
Merged

Fix missing line breaks and typo in githubflow.md #556

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eeede0c
Fix missing line breaks and typo in githubflow.md
TomGillen Aug 4, 2015
4a492d1
Use markdown numbered list in githubflow.md
TomGillen Aug 14, 2015
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
14 changes: 7 additions & 7 deletions docs/git-branching-strategies/githubflow.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ GitHub Flow is a simple and effective branching strategy which the folks at GitH

GitHub Flow is in a nutshell:

1) Update master to latest [upstream](../reference/git-setup.md#upstream) code
2) Create a feature branch `git checkout -b myFeatureBranch`
3) Do the feature/work
4) Push feature branch to [origin](../reference/git-setup.md#origin)
5) Create pull request from origin/<featureBranch> -> upstream/master
6) Review, fix raised comments, merge your PR or even better, get someone else to.
1) Update master to latest [upstream](../reference/git-setup.md#upstream) code
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should actually be 1.

We could change to

1. Update master to latest [upstream](../reference/git-setup.md#upstream) code
1. Create a feature branch `git checkout -b myFeatureBranch`

If you use all 1's then it automatically incremented. Did you want to change this or I can merge and fix later because this is an improvement 👍

2) Create a feature branch `git checkout -b myFeatureBranch`
3) Do the feature/work
4) Push feature branch to [origin](../reference/git-setup.md#origin)
5) Create pull request from origin/<featureBranch> -> upstream/master
6) Review, fix raised comments, merge your PR or even better, get someone else to.

The main rule of GitHub Flow is that master should *always* be deployable. GitHub Flow allows and encourages [continuous deliver](../reference/continuous-delivery.md).
The main rule of GitHub Flow is that master should *always* be deployable. GitHub Flow allows and encourages [continuous delivery](../reference/continuous-delivery.md).

## Resources
- [GitHubFlow guide by GitHub](https://guides.github.com/introduction/flow/index.html)
Expand Down