From c9aa915b7fb1f1e5b7d44ed69ea6469d9356b20f Mon Sep 17 00:00:00 2001
From: Adam Rousell <adam.rousell@heigit.org>
Date: Mon, 16 Mar 2020 09:47:05 +0100
Subject: [PATCH] Updated contribution guidelines and PR template for branching
 from Master

---
 CONTRIBUTE.md            | 4 ++--
 PULL_REQUEST_TEMPLATE.md | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CONTRIBUTE.md b/CONTRIBUTE.md
index 775ebb11d2..017b8921eb 100644
--- a/CONTRIBUTE.md
+++ b/CONTRIBUTE.md
@@ -57,7 +57,7 @@ We :heart: pull requests! We also aspire to make our commit history cleaner and
 We'd like all pull requests to adhere to the following rules:
 
 - a PR has to **close an issue**. If there is none yet for yours, please [create one](https://github.com/GIScience/openrouteservice/issues/new)
-- branch off [development](https://github.com/GIScience/openrouteservice/tree/development)
+- branch off [master](https://github.com/GIScience/openrouteservice/tree/master)
 - name your branch according to `<[hotfix/bugfix/feat/algo]>/<issue#>-<purpose>`, e.g. `[feat]/#381-simplify_geometry`
 - if you introduce new functions/classes, write unit or API tests
 - **limit the number of commits to a minimum**, i.e. use [`git commit --amend [--no-edit]`](https://www.atlassian.com/git/tutorials/rewriting-history#git-commit--amend)
@@ -73,7 +73,7 @@ git stash pop
 
 Be extra careful using `rebase` commands when collaborating on a branch with other people.
 
-**Don't merge** `development` branch into your feature branch.
+**Don't merge** `master` branch into your feature branch.
 
 ### Contributing code
 
diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md
index 010b39aa63..3d2b61a738 100644
--- a/PULL_REQUEST_TEMPLATE.md
+++ b/PULL_REQUEST_TEMPLATE.md
@@ -1,6 +1,6 @@
 ### Pull Request Checklist
 <!--- Please make sure you have completed the following items BEFORE submitting a pull request (put an x in each box when you have checked you have done them): -->
-- [ ] 1. I have [**rebased**](https://github.com/GIScience/openrouteservice/blob/master/CONTRIBUTE.md#pull-request-guidelines) the latest version of the development branch into my feature branch and all conflicts have been resolved.
+- [ ] 1. I have [**rebased**](https://github.com/GIScience/openrouteservice/blob/master/CONTRIBUTE.md#pull-request-guidelines) the latest version of the master branch into my feature branch and all conflicts have been resolved.
 - [ ] 2. I have added information about the change/addition to functionality to the CHANGELOG.md file under the [Unreleased] heading.
 - [ ] 3. I have documented my code using JDocs tags.
 - [ ] 4. I have removed unnecessary commented out code, imports and System.out.println statements.