Skip to content

Commit fd4c2b0

Browse files
authored
Merge pull request #849 from twpol/feature/contributing-forking
Contributed projects and forking clarity
2 parents ebafd5d + 0d4e3da commit fd4c2b0

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

Docs/Contributing.md

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,22 @@ You are free to make any modifications to the Open Rails code that you like; tha
2020

2121
In most cases, you can get started immediately with making the changes and creating a pull request. We do ask for some additional steps to be taken for some bugs and all new features, but they can come before or after the pull request. Please feel free to share ideas and proposals as pull requests!
2222

23-
**Note:** You must start your work from the "master" branch and merged pull requests back into the "master" branch, unless we direct you otherwise.
23+
**Note:** You must fork the Open Rails repository before you start working on it. We do not allow you to push branches to the official repository.
24+
25+
**Note:** You should do your work on separate branches; they must be created from the "master" branch and pull requests must merge back into the "master" branch, unless we direct you otherwise.
2426

2527
### Documentation and translations
2628

2729
If you'd like to improve the [documentation](./), [manual](../Source/Documentation/Manual), or [translations](../Source/Locales) you can get started immediately.
2830

2931
There are no requirements for the pull request.
3032

33+
### Contributed projects
34+
35+
If you'd like to improve the [contributed projects](../Source/Contrib) you can get started immediately.
36+
37+
There are no requirements for the pull request.
38+
3139
### Bug process
3240

3341
If you'd like to fix a bug, you can get started immediately. If the fix turns out to be very small, you do not even need a bug report. Otherwise, you will need to make sure it has been reported on [our bug tracker on Launchpad](https://bugs.launchpad.net/or). If it has not, you can report the bug *and* fix it!
@@ -154,7 +162,7 @@ When we start preparing for a new Stable Version, all code in the Testing Versio
154162

155163
### Submitting your code
156164

157-
When you're done writing code, you should make a pull request on GitHub. The title and description of the requests should concisely indicate what bug or feature you've implemented and you will need to include links to whichever of the following are appropriate:
165+
When you're done writing code, you should make a pull request on GitHub from your fork's branch back to the official repository's "master" branch. The title and description of the requests should concisely indicate what bug or feature you've implemented and you will need to include links to whichever of the following are appropriate:
158166

159167
* Bug report
160168
* Road-map card

0 commit comments

Comments
 (0)