Search code examples
gitconflictgit-pull

CONFLICT (content): Merge conflict in

I have a server with a remote and whenever I git pull I get those stupid ====== and HEAD >>>> things in my files causing my server to not work properly. How can I prevent this every time I want to update my server to be the same as my origin/master?

This is what I did:

git pull production master

Then I got this:

CONFLICT (content): Merge conflict in

When I do a git status I get this:

Unmerged paths:
(use "git add/rm <file>..." as appropriate to mark resolution)

    both modified:      photocomp/settings.py
    both modified:      photocomp/wsgi.py
Solution

  • It seems like you modify files locally.

    If you want to keep a pristine branch of your remote master, I suggest you pull the remote master in a separate branch, like you seem to do but do any modifications in a separate branch.