From a273b69a4c347ecadfbd887e66289d161d14bcd3 Mon Sep 17 00:00:00 2001 From: Tim Sutton Date: Mon, 13 Jan 2014 14:57:27 +0200 Subject: [PATCH] Further tweak to pull request docs. --- CODING | 4 ++-- doc/CODING.t2t | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CODING b/CODING index 145abc24f81..ea039ef4fd4 100644 --- a/CODING +++ b/CODING @@ -633,8 +633,8 @@ deserves your options to accelerate it should be (in order of priority): ================================================== * Always start a feature branch from current master. -* If you are coding a feature branch, don't "merge" anything in other than - master (see below). +* If you are coding a feature branch, don't "merge" anything in to that branch, + rather rebase as described in the next point to keep your history clean. * Before you create a pull request do "git fetch origin" and "git rebase origin/master" (given origin is the remote for upstream and not your own remote, check your .git/config or do "git remote -v | grep github.com/qgis"). diff --git a/doc/CODING.t2t b/doc/CODING.t2t index dd1d47b4ae8..56e8f9c8433 100644 --- a/doc/CODING.t2t +++ b/doc/CODING.t2t @@ -605,8 +605,8 @@ deserves your options to accelerate it should be (in order of priority): ==== Best practice for creating a pull request ==== * Always start a feature branch from current master. -* If you are coding a feature branch, don't "merge" anything in other than - master (see below). +* If you are coding a feature branch, don't "merge" anything in to that branch, + rather rebase as described in the next point to keep your history clean. * Before you create a pull request do "git fetch origin" and "git rebase origin/master" (given origin is the remote for upstream and not your own remote, check your .git/config or do "git remote -v | grep github.com/qgis").