Instead of doing:
git pull remotename remotebranch
Try:
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.
HD.
--
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 [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
