> From: Andrew Steady <steadyand...@gmail.com> > 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.
My vague understanding is that you can tell Git to use any particular merge program you want to. (See merge.tool in the git-config man page.) So presumably, if you can define a merge program that will merge these apparently-conflicting changes in a way that is always satisfying, you can write a wrapper script that uses your merge program for certain specified files and whatever the default is for all other files. Then Git should automatically handle the class of conflicts you've described. Dale -- 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.
