From 9eee689a76cf810d78b8c6d76756fac82445e38a Mon Sep 17 00:00:00 2001 From: auchri Date: Fri, 26 Feb 2016 22:25:56 +0100 Subject: [PATCH 1/2] Rebase instead of merge It's better to rebase a pull request instead of merging the latest commits Signed-off-by: Christoph Auer --- CONTRIBUTING.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 68c80c0a7..35cf65c82 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -89,9 +89,13 @@ Check the log to be sure that you actually want the changes, before merging: git log upstream/master -Then merge the changes that you fetched: +Then rebase your changes on the latest commits in the `master` branch: - git merge upstream/master + git rebase upstream/master + +After that, you have to force push your commits: + + git push --force For more info, see [GitHub Help][help_fork_repo]. From a385c637995d7e5f46cc46f824f33a210c04a027 Mon Sep 17 00:00:00 2001 From: auchri Date: Wed, 24 Feb 2016 20:59:13 +0100 Subject: [PATCH 2/2] Fix link in CONTRIBUTING.md Signed-off-by: Christoph Auer --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 68c80c0a7..c37c3d891 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -73,7 +73,7 @@ For more info, see [GitHub Help][help_change_commit_message]. ## Build instructions -See the [readme][README.md#build-instructions] for details on the various build +See the [README.md](README.md#build-instructions) for details on the various build environments. ## Pull upstream changes into your fork regularly