[fpc-devel] Need advice for refactoring
graemeg.lists at gmail.com
Mon Jul 19 13:26:35 CEST 2010
On 19 July 2010 10:41, Florian Klaempfl <florian at freepascal.org> wrote:
> If you adapted the code without looking at trunk it is *very* likely
> that you didn't create exactly the same code as in trunk so Vincent is
> right: this is very prone to conflicts. One space less and it is a
> conflict for all vcs in the world (hopefully).
This was indeed the case which Vincent commented on. I then suggested
to make another commit in cpstrnew to make the code syntactically
identical to Trunk. I was told this would make no difference,
SubVersion would still raise a conflict. So instead of me making
another commit, Jonas re-synced the whole branch.
- Graeme -
fpGUI - a cross-platform Free Pascal GUI toolkit
More information about the fpc-devel