Git: how do you merge with remote repo?
- by Marco
Please help me understand how git works.
I clone my remote repository on two different machines.
I edit the same file on both machines.
I successfully commit and push the update from the first machine to the remote repository. I then try to push the update on the second machine, but get an error:
! [rejected] master -> master (non-fast-forward)
I understand why I received the error. How can I merge my changes into the remote repo? Do I need to pull the remote repo first?