Skip to content

Commit 98be5cc

Browse files
committed
Merge pull request #556 from thogil/patch-1
Fix missing line breaks and typo in githubflow.md
2 parents 987b4fd + 4a492d1 commit 98be5cc

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

docs/git-branching-strategies/githubflow.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ GitHub Flow is a simple and effective branching strategy which the folks at GitH
33

44
GitHub Flow is in a nutshell:
55

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

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

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

0 commit comments

Comments
 (0)