Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- git pull fatal need to specify how to reconcile divergent branches (problem)
- git pull --rebase (solution)
- git merge origin
- git pull --no-ff -> make fast-forwarding to be off by --no-ff
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
