sthope/gitea_templates
Template
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #23 from yeskunall/master

Browse Source 
Fix minor grammatical error
This commit is contained in:
Vahid Panjganj 2017-07-06 21:16:21 +01:00 committed by GitHub
commit 4bc98156c6
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -57,7 +57,7 @@ We use [Feature-branch-workflow](https://www.atlassian.com/git/tutorials/compari
### 1.2 Some Git Rules ### 1.2 Some Git Rules
There are a set of rules to keep in mind: There are a set of rules to keep in mind:
* Perform work in a feature branch. * Perform work in a feature branch.
* Make a pull requests to `develop` * Make pull requests to `develop`
* Never push into `develop` or `master` branch. * Never push into `develop` or `master` branch.
* Update your `develop` and do a interactive rebase before pushing your feature and making a PR * Update your `develop` and do a interactive rebase before pushing your feature and making a PR
* Resolve potential conflicts while rebasing and before making a Pull Request * Resolve potential conflicts while rebasing and before making a Pull Request