Here's my current workflow:
I have a remote branch "origin/master".
I checkout a new local branch from that remote branch and call it "v1.7-fixes"
Now, when I push changes I select "push current branch to alternative branch" so that I create and push to a new "v1.7-fixes" branch on origin (instead of origin/master).
Next, in order to avoid having to select the new v1.7-fixes branch as an alternative every time I push I need to go into the .git/config file and change the 'merge' setting for the v1.7-fixes branch to use the new remote branch instead of master.
Is there a way to do this in PyCharm without having to hand edit the git config file (or a better way to do this in general)?