Instead of doing:
    git pull remotename remotebranch

    git fetch remotename remotebranch
    git checkout remotename/remotebranch
    git log conflictingfile

You will still need to rename the file prior to do this.

Hope this helps.


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 
For more options, visit

Reply via email to