Hi everyone, So here is the thing, i just don't get the git merge conflict and how to resolve them, especially when i already tried to resolve the conflict and finished to have half my changes merged, the other all ignored and files someone have modified in me personnar repository i dont even know how. I tried to find documentation about how to resolve this but i don't find anything i can understand, it's really depressing.
Thanks for your help -- 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.
