This content has been marked as final.
Show 2 replies
-
1. Re: Best files update strategy
jaikiran Apr 7, 2009 12:23 PM (in response to alesj)"alesj" wrote:
Btw: is there some oss framework like svn's merge,
so instead of overriding files, we would simply merge them?
Not sure whether there's a existing project for this, but do we really want to merge the changes? Shouldn't it be a total overwrite? In case of merging, i guess we would introduce more complexity like how to deal with merge conflicts? -
2. Re: Best files update strategy
alesj Apr 7, 2009 1:18 PM (in response to alesj)I'm just thinking outloud. :-)
Since in most cases you just change/fix a few minor things,
changing some line, typo or simple configuration.
It would of course be configurable,
e.g. merge-fail, merge-override, override, ...