[fpc-devel] Need advice for refactoring

[Marco van de Voort]

In our previous episode, Graeme Geldenhuys said:
> > I never encountered this and doubt it :) because svn recognizes also
> 
> Then some core team members should retrain themselves with SubVersion
> so they know what it can and cannot do. This will reduced them
> spreading incorrect information to others not so proficient with
> SubVersion. I don't used SubVersion for over a year now, so I've lost
> some of my SVN knowledge, or what the latest svn can and cannot do.

There is a difference between 

- two way merge (patch and diff)

- a three point merge (cur revision of both
  branches and the ancestor file of both branches), which afaik SVN does.

-  a n-point merge that takes tracks through each revision of both branches,
    what according to Graeme GIT does.