[git-users] When checking out master into a branch, how do I deal with files that say they're modified but weren't?

I've updated my branch from master and have gotten a series of merge errors. Normally I would just adjust the code and re-commit, but I am unsure about how to go about the ones in the following situation: # both modified: /js/foundation6.init.js <--this is updated in master. I

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

- 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

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

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

Re: [git-users] Pushing 2 different branches to the same repo, git says the repo has different files each time.

AD S writes: > Sorry, noob here again. To make explaining this simple I will focus on one > file. > > I've got 2 branches: BranchA and BranchB. > > In both Branches I have had to work on the same file, a style.css file. > > I push BranchA.css to the remote repo. That

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

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