Hi, We have a number of files in our source which feature lists, the more of these that are configuration files the better though we do have some lists in code as well.
These lists become a frequent source of conflict as people working on different branches modify the lists, usually but not always by adding. Whilst considering a refactoring exercise to alleviate the issue, I wondered if there is instead a way to inform Git that certain files are of a particular nature for which changes from both sides should be honored, even if they affect the same or adjacent lines. There is the complication of the delimiter of course - e.g. when you add a line at the end of a list, the line beneath may need a delimiter adding or the line above have one removing if you remove from the list. I saw options on different merge strategies but couldn't understand any difference in how the process at the line level. Any pointers much appreciated. Andy -- 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/groups/opt_out.
