Minimizing code merge conflicts

PowerBuilder has the unexpected behavior of changing the order of code blocks in the source code. For example, when the prototype of the function is modified (e.g., by adding an argument or changing the function name), the entire code block of the function will be moved to the end of the code within the window; when multiple objects are modified simultaneously in DataWindow, even though you make no changes but just move them, the corresponding code block is relocated to the end of the source file.

The movement of code blocks creates unnecessary conflicts when merging the source code using SVN, Git etc. And now this behavior has been rectified and the code merge conflicts will be minimized.