My question arises due to encountering a merge conflict while testing. When committing an object within PB it will only commit in the ws_objects folder. If you go to Windows explorer, you will see a visual representation indicating that the sub-folder you have the affected .pbl located needs be resolved as well.

The question therefore is do we commit both the object (under ws_objects) and the .pbl itself within the folder? I encountered the .pbl itself as a merge conflict. Doesn't appear that one could resolve that and would have to choose one over the other. My fear is if I don't commit the .pbl will I and/or the next user get the code fix with the next cloning

Thanks in advance....