[fpc-devel] FPC 2.6.x branched, trunk becomes 2.7.1

[Michael Schnell]

On 08/03/2011 05:55 PM, Marco van de Voort wrote:
>
> Most likely because you have local modifications to those files, from own
> running of fpcmake.
I never intentionally made modifications or used dpcmake.

Nonetheless I often get one or two conflicts.

I suppose I should delete everything and restore from the server.

Or is the another option to have svn get the current version of 
everything ?

-Michael