Skip to content

Commit

Permalink
Further tweak to pull request docs.
Browse files Browse the repository at this point in the history
  • Loading branch information
timlinux committed Jan 13, 2014
1 parent 88c73a1 commit a273b69
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions CODING
Expand Up @@ -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").
Expand Down
4 changes: 2 additions & 2 deletions doc/CODING.t2t
Expand Up @@ -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").
Expand Down

1 comment on commit a273b69

@m-kuhn
Copy link
Member

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

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cheers

Please sign in to comment.