Set merge strategy and handle offline working session

Fix ```GitUtils.fetchBranchFromRemoteBranch``` and ```GitUtils.pullExistingBranch```
to handle correctly raised exceptions if the user is offline.
Also set the merge strategy to ```THEIRS``` for the moment.
Keep the most recent version of files in case of conflict