----- Original Message ----- From: AD S To: Git for human beings Sent: Tuesday, February 21, 2017 4:42 AM Subject: [git-users] Noob question: How can I inspect a file 'added by them'?
Both myself and someone else have added the same file and so when I've tried to push my file to a remote repo, I get the error `added by them: styles.scss`. I want to inspect 'their' file to see how it differs from mine. Is there a way I can view that file with the command line? There is no single command to look directly at their file (unless you have a web browsing facility, but I don't think that is what you mean). For the two step command: first `git fetch <remote>` second, do a diff between the <remote>/<branch> and your HEAD (if your file is there) and the -- <filename>. The main point being that having done the fetch (but not that tricky merge or pull), you now have a branch, under the <remote> namespace, that has their file, ready for inspection. Philip -- 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.
