Crash when trying to sync with main branch that have diff history

[amerharb]

Handel the error:
⨯ Error: Need to specify how to reconcile divergent branches.
at new Promise ()
at Generator.next ()

Description

In case the local repo main branch have a divergent history than main in the remote the app crash at first requires as it fail to "git pull"

Suggestion: Always to force and rebase with git pull from main, in other words to accept remote as is. Or basically always checkout the new branch from origin/<

> in this case we only need to git fetch then checkout new branch from origin/<>