Update submodules on rollback
Ensure that remotes are present before using them
Use repo, not user for git remotes
Merge pull request #75 from rschlaikjer/fix-submodule-conflict-check

Fix submodule conflict checking, missing remotes, repo logic error

* Submodules are refreshed before between merge flows
* Ensure proper remotes are fetched before referring to them in pickme flows