Skip to content
Permalink
Browse files

Further tweak to pull request docs.

  • Loading branch information
timlinux committed Jan 13, 2014
1 parent 88c73a1 commit a273b69a4c347ecadfbd887e66289d161d14bcd3
Showing with 4 additions and 4 deletions.
  1. +2 −2 CODING
  2. +2 −2 doc/CODING.t2t
4 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").
@@ -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").

1 comment on commit a273b69

@m-kuhn

This comment has been minimized.

Copy link
Member

@m-kuhn m-kuhn commented on a273b69 Jan 13, 2014

Cheers

Please sign in to comment.
You can’t perform that action at this time.