When you use &shortcut:UpdateProject; (VCS | Update Project) to pull changes from VCS, you can choose whether you want to Merge your local changes or Rebase. If you choose Default Branch, you'll be able to specify the strategy per branch in the branch.<name> section of the .git/config configuration file.