Re: [git-users] Noob question: How can I inspect a file 'added by them'?

2017-02-21 Thread Philip Oakley
- 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 pu

Re: [git-users] Noob question: How can I inspect a file 'added by them'?

2017-02-21 Thread Konstantin Khomoutov
On Mon, 20 Feb 2017 20:42:58 -0800 (PST) AD S wrote: > 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

Re: [git-users] Noob question: How can I inspect a file 'added by them'?

2017-02-21 Thread Magnus Therning
AD S 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 comma

[git-users] Noob question: How can I inspect a file 'added by them'?

2017-02-20 Thread AD S
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? -- You receiv