Read below to make sure you’re in the same boat.
I had a branch set up on Server A that I committed to the remote repository.
I had a branch set up on Server B that I committed to the remote repository.
Now, Remote Repository has branch from A and B.
Pulling branch B or branch A from either server would result in merge conflicts.
If you are…
How to do I get git to pull overwriting /everything/ ? I just need exactly what is on the remote server.
Now I’m starting to sound very stupid: I just needed to do
git fetch origin branch
Apparently, git pull always merges with the current branch. Not proud to admit I’m just starting to get Git.