to automatically resolve [...] . After the conflict is resolved [...] , then you have to resolve

user resolve [...] should try to resolve [...] should try to resolve

, then they have to be resolved first [...] cannot be resolved automatically

been resolved are selected [...] : Resolve manually : A [...] . Resolve using 'ours' :

FastForwardStrategy.NoFastForward pull_options.resolve_file_conflict_strategy = GitResolve