Skip to content
Chris Shinn edited this page May 4, 2017 · 6 revisions

(This is necessary if you want to work on multiple features at once)

Create your new branch

  1. Click the branch button.

Pulling in SourceTree

  1. A modal will pop up. Name your new branch after the feature that you are working on and click Create Branch

Pulling in SourceTree

  1. 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.

Committing changes

Commit and push your changes

  1. This process uses the same method documented here
  2. 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.

Committing changes

  1. You should see that your new branch is up to date, and has been added to your list of remotes.

Committing changes

Create a pull request

  1. This process uses the same method documented here
  2. 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.

Sync the changes to your master branch

  1. With local/master checked out, click Pull
  2. Pull from your master branch in the upstream repository and click OK

Committing changes

  1. Click Push and push to the master branch of your origin repository.

Committing changes

Delete your temporary branch

Do this only when your pull request has been merged and you are finished with your feature branch

  1. Right click on the local version of your temporary branch and select Delete <name_of_feature_branch>.

Committing changes

  1. Check the box by Delete remote branch and click `OK

Committing changes

  1. Click OK again to confirm the deletion.

Committing changes