AD S <a...@radianweb.com.au> writes: > 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?
I would have guessed that you'd get a message saying that your branch is behind, not that they've added a specific file. Anyway, you need to fetch the changes from upstream and then merge. Once you've merged you can push. As part of the merge you'll get to see what the differences between your changes and theirs are. /M -- Magnus Therning OpenPGP: 0x927912051716CE39 email: mag...@therning.org jabber: mag...@therning.org twitter: magthe http://therning.org/magnus The man who is denied the opportunity of taking decisions of importance begins to regard as important the decisions he is allowed to take. — C Northcote Parkinson -- 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.
signature.asc
Description: PGP signature
