
18 Jul
2008
18 Jul
'08
3:44 p.m.
Pascal Dennerly wrote:
Could it be that someone has updated the offending file before you committed the change and created a conflict? If you do an update on top of your changes, do you get merge conflicts?
Never hurts to do and svn cleanup from time to time either.
Been there done that :-( In the end I had to delete the whole tree, check out again and redo the merge :-( John.