I have a site local repo and a remote repo.
Local repo contains the 1-2 month old content of remote repo.

I try to pull the whole content into local repo.

    git pull origin master
    From ssh://.../site.git
     * branch            master     -> FETCH_HEAD
    CONFLICT (add/add): Merge conflict in admin/process_email.php
    Automatic merge failed; fix conflicts and then commit the result.

I checked process_email.php using P4Merge, but shows no conflict, 
furthermore there were no changes at all, no difference.

I get 

    $ git status
    On branch master
    nothing to commit, working directory clean on both repos. 

Also I tried 

    $ git pull -X theirs origin/master master

But still get the same error.

I want to merge the remote origin repo with my local repo.
I want to overwite local repo with remote origin repo content as the remote 
repo is newer, contains the latest code.

More than 2000 files are conflicting, while I checked the conflict and they 
have the same content. I would not want to do manual conflict handling. 

I have 
autocrlf = False
in the .gitconfig.

Why do I get conflict error for files, which have exactly the same content?

You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Reply via email to