Skip to content

Commit

Permalink
Fix wording
Browse files Browse the repository at this point in the history
  • Loading branch information
@rhuss @jdavisonc
rhuss authored and jdavisonc committed Jul 24, 2015
1 parent e18d44a commit b4ba873
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions doc/contributing.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ which you can put into your `~/.gitconfig`:
````

When sending pull request we prefer that to be a single commit. So please squash your commits
with an interactive rebase before sending the pull request. And of course your pull request should be
rebased to the current master. All this is nicely explained [here](https://github.com/edx/edx-platform/wiki/How-to-Rebase-a-Pull-Request).
with an interactive rebase before sending the pull request. Also, your pull request should be
rebased to the current branch `integration`. All this is nicely explained [here](https://github.com/edx/edx-platform/wiki/How-to-Rebase-a-Pull-Request).

Said all this, don't hesitate to ask when there are any problems or you have an issue with this process.

0 comments on commit b4ba873

Please sign in to comment.