Resolve conflicts
If more than one developer are making changes to the same object
and committing the object at the same time, conflicts will occur when
synchronizing the object. When conflicts are detected, the object in
the library tree will be marked by a “!!” sign (
) and you will be prompted in the output view
and will have to resolve the conflict manually.
Note
If the workspace has already been added to the SVN source
code system in PowerBuilder 2017 R2, please remove its binary
property first before resolving conflicts in PowerBuilder 2017 R3.
See Remove the binary property
from a R2 source-controlled workspace for details.
The following steps walk you through how to resolve the
conflicts and merge the changes (Suppose developer A and B make
changes to the same PowerBuilder object at the same time):
Step 1: Developer A commits the object to the source control
server successfully.
Step 2: When developer B tries to commit the object, he receives
a message requiring him to update the object first, so developer B
performs SVN Update, then the object in the library tree will be
marked by a “!!” sign () which means there is a conflict, and the
changes made by Developer B, the original code, and the changes made
by Developer A will be listed together in the object’s source
code.
Step 3: Developer B looks into the object’s source code and
decides which changes to keep (the changes made by Developer B, the
original code, or the changes made by Developer A). He manually
removes the unwanted changes from the object’s source code.
Note
After you merge the changes, make sure the object can be
compiled successfully by PowerBuilder, otherwise, the object may be
missing or fail to open in the PowerBuilder IDE, or may cause the
PowerBuilder IDE to crash.
Step 4: Developer B performs SVN Resolve for the object to
refresh the object status (clears the conflict sign) and then commit
the object to the server.