sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-13 00:03:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Further tweak to pull request docs.

Browse Source
This commit is contained in:
Tim Sutton 2014-01-13 14:57:27 +02:00
parent 88c73a13c5
commit a273b69a4c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CODING
View File

@ -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").

4
doc/CODING.t2t
View File

@ -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").