On 2017-04-03, at 8:18 PM, [email protected] wrote: > The .gitignore file doesn't result in anything being ignored. It's still > looking at these .gif files, not only that buy jquery library files too. I > can't even create a branch since all I get are these needs merge errors. > > How long is the learning curve on git? My boss says 4 hours but since I've > already spent several days and have gotten essentially nowhere, I'd say 6 > months. 3 months if I get lucky.
4 hours? Well, it is saying that a .gif needs a merge because you have two different changes made. So, how did you get two different changes? (you'd need to tell us what you did). And, can't create a branch? ... Can you send your list of commands? -- 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.
