From 571bdac0b748eb5a32404204b0041c40a23628df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henri=20Hyyryl=C3=A4inen?= Date: Mon, 11 Feb 2019 09:45:51 +0200 Subject: [PATCH] Removed strange sounding wording from the link to the style guide and added comment about recommended usage of branches --- README.md | 2 +- doc/setup_instructions.md | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 81f885e8fee..034006d9c93 100644 --- a/README.md +++ b/README.md @@ -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. diff --git a/doc/setup_instructions.md b/doc/setup_instructions.md index 899e27e7644..53066abe5fa 100644 --- a/doc/setup_instructions.md +++ b/doc/setup_instructions.md @@ -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