Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PR: Add git command for changing base branch to Contributing guide #4621

Merged
merged 1 commit into from
Jun 21, 2017

Conversation

rlaverde
Copy link
Member

Fixes #4592

@rlaverde rlaverde added this to the v3.2 milestone Jun 20, 2017
@rlaverde rlaverde self-assigned this Jun 20, 2017
@rlaverde rlaverde requested a review from ccordoba12 June 20, 2017 18:01
CONTRIBUTING.md Outdated
### 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`
Copy link
Member

Choose a reason for hiding this comment

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

git rebase --onto, like this:

Copy link
Member

Choose a reason for hiding this comment

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

I mean, please add like this but without emphasis :-)

CONTRIBUTING.md Outdated
$ git rebase --onto <new_base> <old_base> <branch>
```

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

Choose a reason for hiding this comment

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

your_branch -> my_branch

@ccordoba12
Copy link
Member

Looks good. I left a couple of minor comments, then I'll merge.

@rlaverde rlaverde force-pushed the git-commands-contributing branch from 769d5fe to 717205e Compare June 20, 2017 18:56
@ccordoba12 ccordoba12 changed the title PR: Add git command for changing base branch to Contributing guide. PR: Add git command for changing base branch to Contributing guide Jun 21, 2017
@ccordoba12 ccordoba12 merged commit 3507b14 into spyder-ide:3.x Jun 21, 2017
ccordoba12 added a commit that referenced this pull request Jun 21, 2017
@rlaverde rlaverde deleted the git-commands-contributing branch June 21, 2017 13:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants