Developing with Servoy 4.1 leds (too often) to a situation where I just can’t commit to the repository! I spent hours and couldn’t find a way to commit my development work - the result: I have lost it!
For example renaming a Form leds to a desaster I can’t resolve. When synchronizing, you see on the left side the local file, on the right side where usually the server side is - nothing. And as I said I can’t commit the left hand side stuff to the repository!
Thanks god we have Time Machine on the server to get the latest servoy_repository db files, but this is definitely no fun.
What’s also wierd is that sometimes committing leds to no errors, i. e. everything looks fine in the Solution Explorer, but as soon as I synchronize, errors appear (as described above).
I’m a standalone developer and I too have had difficulties at times with committing my changes. I have generally found that flagging each conflict ‘mark as merged’ works, although I know this option isn’t always available.
I reported this issue before to Servoy.
They promised to have this solved with the next version.
As far as I can remember it is not reported as fixed yet though.
from you screen, it seems that “PerRelationsStudent” form has been deleted from the repository (this can be because of a rename), but
in the mean time, you did changes localy in the form’s methods, and this conflict is reported in the synch view
of course you won’t be able to commit this, as the form does not exist anymore, but if this remote delete was as a result of a rename,
then you should have your changes in the renamed form, and so, you can let the team plugin delete the conflicting file
