[fpc-devel] Need advice for refactoring

Florian Klämpfl florian at freepascal.org
Sun Jul 18 22:35:03 CEST 2010

Graeme Geldenhuys schrieb:
> On 18 July 2010 02:58, Marc Weustink wrote:
>> I don't doubt the ability to merge, but will it result in usable/meaningfull
>> code too ?
> A silly question.

Or you missed the contents of the question. The problem Marc brings up
is: what happens if branch and trunk/another branch change the same
line/tokens of code and then those branches are merged. A good vcs comes
up with a conflict, a vcs trying to be too clever merges maybe both
lines creating nonsense code or whatever.

(Well, and the Linux kernel isn't for me a good argument, it's quality
decreased steadily during the last years.)

More information about the fpc-devel mailing list