GIT: pulling a branch results in a conflict. Why?

Question

I have some local version of a some branch. It was pulled some time ago. Now I want to update that branch with a fresh updates. I call

git fetch;
git pull;

And I get a number of conflicts in my working directory!

Why this happens? Before pull my working directory was clean. No commits from my side. No divergence possible. And despite this I see conflicts.

Why this happens?

How can I fix it?

Looks like the reason is that the branch was deleted and then re-created. — MiamiBeach, Jan 28 '16 at 16:41

score 1 · Answer 1 · edited May 23 '17 at 11:44

1

You likely have changes that need to be committed before you pull. Make sure you commit your changes before you pull

Also, you don't need to pull and fetch: pull calls fetch. Please see documentation on Git pull Operation and this answer. I also recommend you search for "Git best practices". You'll find a whole host of articles on the interwebs, e.g. an effective Git branching model.

edited May 23 '17 at 11:44

Community

1
1

answered Jan 28 '16 at 15:03

Austin

8,018
2
31
37

Thanks, Austin, looks like the reason is that the branch was deleted and then re-created. – MiamiBeach Jan 28 '16 at 16:42

GIT: pulling a branch results in a conflict. Why?

1 Answers1