Servoy 4 - Synchronize in Eclipse

Classic Servoy
1

I’m using the Synchronize perspective in Servoy Eclipse and have noticed something that has me puzzled.

I have made some changes in my workplace with a few dbi’s.

I tried to commit and got warnings that there were conflicts. So I did a synchronize and was presented with all my changes conflicted with the remote file.

The thing is, I want the local file to commit and overwrite the remote file… but the option to copy from left to write is grayed out. I’m stumped. Why is this?

Chico

2

That is default Eclipse behavior.

To copy your local changes over the remote version, right-click the object in the tree on the left and select “mark as merged”. After that, you’ve marked your local version as leading and you can commit it to your remote version.

Paul