When you are in a merge conflict, some of your files will be modified by the changes you are merging (some others will be added or deleted) and others will be in conflict. You need to fix those files with conflicts in order to finish the merge. So those changes that other person made are in there because you are in a merge conflict.
You should read [1] [1] https://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging#_basic_merge_conflicts El mié., 23 de nov. de 2016 a la(s) 16:43, Daniel PRESA < daniel.c.pr...@gmail.com> escribió: > 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 git-users+unsubscr...@googlegroups.com. > For more options, visit https://groups.google.com/d/optout. > -- 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 git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
