When conflicts are present pulling from a remote repository only works if "Use rebase instead of merge" is selected. Otherwise the operation fails - e.g the following error is displayed without providing a way forward:
From ../remote-repo
= [up to date] main -> origin/main
fatal: Need to specify how to reconcile divergent branches.
When conflicts are present pulling from a remote repository only works if "Use rebase instead of merge" is selected. Otherwise the operation fails - e.g the following error is displayed without providing a way forward: