Skip to content

Commit

Permalink
Add git command for changing base branch to Contributing guide.
Browse files Browse the repository at this point in the history
  • Loading branch information
rlaverde committed Jun 20, 2017
1 parent 6b3d177 commit 769d5fe
Showing 1 changed file with 15 additions and 0 deletions.
15 changes: 15 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,21 @@ So to start working on a new PR, you need to follow these commands:
$ git checkout -b name-new-branch
```

### Changing base branch

If you started your work in the wrong branch, or want to backport it, you could
change the base branch using `git rebase --onto`

```bash
$ git rebase --onto <new_base> <old_base> <branch>
```

For example, backporting `your_branch` from `master` to `3.x`:

```bash
$ git rebase --onto 3.x master your_branch
```

## Running Tests

Install our test dependencies:
Expand Down

0 comments on commit 769d5fe

Please sign in to comment.