-
Notifications
You must be signed in to change notification settings - Fork 103
Multiple Branches
Chris Shinn edited this page May 4, 2017
·
6 revisions
- Click the branch button.
- A modal will pop up. Name your new branch after the feature that you are working on and click
Create Branch
- You should see that your new branch is "checked out" and has the circle symbol next to it. This means that any changes that you make to your local files will be saved to this branch. If it is not checked out, simply double click on the branch's name in the sidebar to check it out.
- This process uses the same method documented here
- When prompted to push your changes, instead of checking the box by
master
, check the box by your new branch. If the corresponding remote branch does not already exist, it will be automatically created when you check the box.
- You should see that your new branch is up to date, and has been added to your list of remotes.
- This process uses the same method documented here
- When prompted to select the local and remote repositories to use in the pull request, make sure that your feature branch is selected for both fields instead of master.
- With
local/master
checked out, clickPull
- Pull from your
master
branch in theupstream
repository and clickOK
- Click
Push
and push to themaster
branch of yourorigin
repository.
Do this only when your pull request has been merged and you are finished with your feature branch
- Right click on the local version of your temporary branch and select
Delete <name_of_feature_branch>
.
- Check the box by
Delete remote branch
and click `OK
- Click
OK
again to confirm the deletion.