Skip to content

Commit 7fff332

Browse files
Merge pull request #91 from vikasnautiyal/enhancement/contribution-update
update contribution to branch off development
2 parents 74b7bff + d347ee7 commit 7fff332

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

.github/PULL_REQUEST_TEMPLATE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Closes #2
1212
### Checklist
1313
- [ ] I have made a material change to the repo (functionality, testing, spelling, grammar)
1414
- [ ] I have read the [Contribution Guide] and my PR follows them.
15-
- [ ] I updated my branch with the master branch.
15+
- [ ] I updated my branch with the development branch.
1616
- [ ] I have added tests that prove my fix is effective or that my feature works
1717
- [ ] I have added necessary documentation about the functionality in the appropriate .md file
1818
- [ ] I have added in line documentation to the code I modified

CONTRIBUTING.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,6 @@ rake
130130

131131
Generally, we follow the style guidelines as suggested by the official language. However, we ask that you conform to the styles that already exist in the library. If you wish to deviate, please explain your reasoning.
132132

133-
Generally, we follow the style guidelines as suggested by the official language. However, we ask that you conform to the styles that already exist in the library. If you wish to deviate, please explain your reasoning.
134-
135133
- [Community Driven Style Guide](https://github.com/bbatsov/ruby-style-guide)
136134

137135
Please run your code through:
@@ -159,7 +157,7 @@ Please run your code through:
159157
git pull upstream <dev-branch>
160158
```
161159

162-
3. Create a new topic branch (off the main project development branch) to
160+
3. Create a new topic branch off the `development` branch to
163161
contain your feature, change, or fix:
164162

165163
```bash
@@ -179,7 +177,7 @@ Please run your code through:
179177
5. Locally merge (or rebase) the upstream development branch into your topic branch:
180178

181179
```bash
182-
git pull [--rebase] upstream master
180+
git pull [--rebase] upstream development
183181
```
184182

185183
6. Push your topic branch up to your fork:
@@ -189,6 +187,6 @@ Please run your code through:
189187
```
190188

191189
7. [Open a Pull Request](https://help.github.com/articles/using-pull-requests/)
192-
with a clear title and description against the `master` branch. All tests must be passing before we will review the PR.
190+
with a clear title and description against the `development` branch. All tests must be passing before we will review the PR.
193191

194192
If you have any additional questions, please feel free to [email](mailto:[email protected]) us or create an issue in this repo.

0 commit comments

Comments
 (0)