Need to specify how to reconcile divergent branches
Run one of these commands:
| Strategy | Command |
|---|---|
| Merge (default) | git config pull rebase false |
| Rebase | git config pull rebase true |
| Fast-Forward | git config pull ff only |
Or use git config --global to set a default pereference for all repositories.
Comparison
Merge, rebase, fast-forward are the strategy for resolving conflict: you are trying to pull changes from the remote branch, but you have made some local commits.
1. Merge
Git will pull changes and merge into your current local branch. It will create a new “merge commit”.
2. Rebase
Git will pull changes and synchronize your “base” branch. Your local commits will be moved after the synchronized branch.
3. Fast-Forward
Git will refuse to pull changes until you push your commits to the remote branch.
No credential store has been selected
Link: gcm
Choose one of the credential store methods.
Unable to find remote helper for ‘https’
Link: stackoverflow
I was able to solve with the one that says:
- Remove
snapversion and install it withaptversion. Follow this instruction.