Merge pull request #313 from NLeSC/remove-version-control-chapter

Remove chapter on version control
NLeSC · Nov 15, 2023 · e8bd065 · e8bd065
2 parents 0d1d86c + 79d5976
commit e8bd065
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 122 deletions.
diff --git a/_sidebar.md b/_sidebar.md
@@ -1,7 +1,6 @@
 
 * [Introduction](/README.md)
 * [Best practices](/best_practices/overview.md)
-   * [Version Control](/best_practices/version_control.md)
    * [Code Quality](/best_practices/code_quality.md)
    * [Code Review](/best_practices/code_review.md)
    * [Testing](/best_practices/testing.md)

diff --git a/best_practices/documentation.md b/best_practices/documentation.md
@@ -90,7 +90,7 @@ file describes at least how to perform the following tasks:
 * How to run [(unit) tests](testing.md#unit-tests)
 * What [code style](https://the-turing-way.netlify.app/reproducible-research/code-quality/code-quality-style.html) to use
 * Reference to [code of conduct](#code-of-conduct)
-* When using a [git branching model](version_control.md#choose-one-branching-model), the choice of branching model
+* Mention the [git branching model](https://www.atlassian.com/git/tutorials/comparing-workflows) when using anything else than the [GitHub flow branching model](https://guides.github.com/introduction/flow/)
 
 An extensive example is [Angular.js's CONTRIBUTING.md](https://github.com/angular/angular.js/blob/master/CONTRIBUTING.md). Note that [GitHub has built in support for a CONTRIBUTING.md file](https://github.com/blog/1184-contributing-guidelines).
 

diff --git a/best_practices/version_control.md b/best_practices/version_control.md