[BUG] Pulling fails if merge is selected and conflicts exists

[mjfs]

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.

[love-linger]

This error message comes from the git pull --verbose --progress <REMOTE> command. For details information, you can just open LOG window.

[love-linger]

I've pushed a new commit that uses --rebase=false when pulling with Use rebase intead of merge unchecked.

[mjfs]

Thanks, this now works as expected.

Regarding the related issue - that one is not a duplicate:

While the current issue is about the merge option not being supported at all (which is now fixed), the related issue is primarily about being able to take into account the git's configuration and providing the user with a clear information that this will indeed be the case (via drop-down "Default" option - which SourceGit does not currently provide)

In addition the related issue also tries to provide the user with the list of all of the available options while at the same time not discriminating between them (having just a two-state checkbox definitely provides misleading information to the user).