Dear list, although I have been using git for almost three years, I have used it only for my writings (I cannot code).
This reduces the need for branches and the possibility of merge conflicts. I experienced less than five, due to the fact of working in different computers (and having forgotten to sync repos the right way). My question is simple: what causes a merge conflict? I mean, changes in different files are merged fine, since the most updated version of each is merged. I thought the same happened with different lines (the latter modified line is kept in the merged file), but I can’t say for sure after experiencing the merge conflicts. Could you confirm whether lines are merged independently or whether there is always a conflict when one tries to pull a modified file from remote in a file that was also modified after latest push in local? Many thanks for your help, Pablo -- http://www.ousia.tk -- 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.
