On Fri, 13 Mar 2009, saurabh gupta wrote:
Very well described, David. I agree with you and providing these merge
options to the user, merge drivers can do the work and mark the
conflicts according to the option. The work to do is to modify the
merge driver. I think in this way, even people who have only a
terminal can also gain from it. They can choose the apt option to see
the conflict markers in their way. So, the aim is to make merge driver
configurable and create the merged/conflicted file according to the
options.
for the GSOC I suspect that the right thing to do is the define one or
more merge drivers to create, and list what applications are going to be
used for testing these merges.
you and the mentor can decide what is a reasonable amount of work.
it may be just doing an XML merge driver is a summer's worth of work, or
it may be that it's not really enough and you should try to do another one
or two.
it also may be that there is a lot of overlap between different merge
drivers, and once you have the XML driver the others become fairly trivial
to do. (I'm thinking the config file examples I posted earlier in the
thread)
David Lang
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
