[UPHPU] Source Code Control Options

[Alvaro Carrasco]

Roberto Mello wrote:
>>     
> ...
>
> Subversion lacks merge tracking, which I find extremely problematic,
> but the upcoming version adds that. It has a fair share of caveats,
> but it works well and is well supported.
>
> ...
>
> Roberto
>
>   
It is true that it lacks merge tracking, but you can use the svnmerge.py 
tool to track merges for you. It works great.

Alvaro