Skip to content

Commit

Permalink
Removed strange sounding wording from the link to the style guide and
Browse files Browse the repository at this point in the history
added comment about recommended usage of branches
  • Loading branch information
hhyyrylainen committed Feb 15, 2019
1 parent 1cc8c37 commit 571bdac
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ both for guidelines on code formatting and git usage.
And [AngelScript primer][asprimer] for scripting help.

### C++ Programmers
To compile Thrive yourself, you will not only need to follow the [setup instructions][setupguide].
To compile Thrive yourself, you will need to follow the [setup instructions][setupguide].

Be sure to have a look at the [styleguide][styleguide],
both for guidelines on code formatting and git usage.
Expand Down
3 changes: 2 additions & 1 deletion doc/setup_instructions.md
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,8 @@ graphical tool for reviewing the exact lines you have changed, but you
can also commit on the command line) you can publish them to your fork
with (assuming you used the master branch, when working with the main
thrive repository you MUST create a different branch but when working
with a fork that isn't required):
with a fork that isn't required, but still strongly recommended as
making multiple pull requests with one branch is messy):

```
git push fork master
Expand Down

0 comments on commit 571bdac

Please sign in to comment.