Configuring branches
All local branches (both newly created and already existing ones) can be configured in order to track a corresponding remote branch for making pulling, pushing, and fetching simpler and easier.
You can configure your local branch when creating it or later by using the GIT Branch Configuration dialog.
To start the Configure Branch dialog, right-click the necessary branch in the GIT Repositories view and select Configure Branch... in the context menu:
Step 4. Choose whether you want your local branch to rebase onto the arriving changes when pulling.
If you leave the option unchecked, the new changes coming from the tracking branch will be merged.
