...
- "Update method:" should be "Branch default"
- "Auto-update if push of the current branch was rejected" should be unchecked
General Tips
...
Show open file in Navigator
A nice to have setting is to enable Autoscrolling autoscrolling in the Project Navigation within PyCharm
- On the top of the Navigation pane, to the right of the "Project" selection, select the "Gear" icon.
- Enable "Autoscroll to Source"Enable "Autoscroll from SourceAlways Select Opened File"
Now when you open a file it the Navigation pane will highlight that file.
...