AD S <[email protected]> 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 works fine. > > Now, I push BranchB into the same repo. I'm expecting a merge conflict with > styles.css of course. But I get the message 'deleted by them stylescss'. > > I check with my coworkers. No ones deleted that file in the short while > between each push. > > Would anyone know why this could happen?
I think it'd help if you showed us the exact commands you are typing. Why were you expecting a *merge* confligt when *pushing*? (That expectation suggests that you need to read up a little on what a branch is in git.) /M -- Magnus Therning OpenPGP: 0x927912051716CE39 email: [email protected] jabber: [email protected] twitter: magthe http://therning.org/magnus Eagles may soar, but weasels don't get sucked into jet engines. -- 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 [email protected]. For more options, visit https://groups.google.com/d/optout.
signature.asc
Description: PGP signature
