Re: [git-users] When updating from master, I get a message on a file that was 'added by us' although this file is its self on master.

AD S writes: > When updating from master I get a message > > added by us: sass/styles.scss > > However, this file already exists on master. > > Shouldn't this just be a merge conflict? What's the state of the local file? /M -- Magnus Therning OpenPGP: 0x927912051716CE39 email

[git-users] When updating from master, I get a message on a file that was 'added by us' although this file is its self on master.

When updating from master I get a message added by us: sass/styles.scss However, this file already exists on master. Shouldn't this just be a merge conflict? -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from