Skip to content

Commit

Permalink
Work-in-progress goes now to master.
Browse files Browse the repository at this point in the history
  • Loading branch information
@rhuss
rhuss committed Dec 17, 2016
1 parent 7afec26 commit 4d3896d
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions CONTRIBUTING.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@ 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. 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).
with an interactive rebase before sending the pull request. 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 4d3896d

Please sign in to comment.