[fpc-devel] Need advice for refactoring

[Marco van de Voort]

In our previous episode, Graeme Geldenhuys said:
> 
> I can't comment on SubVersion, but with Git I have feature branches
> that live for a couple of months before they get merged. I have no
> problems with that. So maybe it's down to the way SVN is used? I don't
> know. All I can say (which applies to all VCSes), is that not all
> features (and thus feature branches) can be implemented and tested in
> a few days.

This was all about the chance that patches don't merge in two heavily
mutating branches. 

Unless other systems really take into account the complete history of
both divergating branches in the merge, and not simply patch/merge, I doubt
VCS matters at all