Missing code merge issue...

[Karl Krasnowsky <kk...@lingosys.com>]

Since I'm using Subversion through the embedded plugin in Netbeans 6.8,
I'm not sure where the finger should point, but was hoping I'd at least
get some ideas on how to determine the direction from this list.

 

During a merge process back to the trunk from a branch copy I'm getting
a few conflicts to which Netbeans provides the service to resolve via
their merge view (it provides a left and right depiction of the files,
highlighting the conflicted bits and given you the choice of accepting
the changes from one side or the other eventually deriving to the final
"resolved" version.

 

On more then one occasion, while this identified the conflicted bits, it
failed to import the sections of new code within these same files. It
would appear that the process that is doing the left/right file
generation for the conflict is neglecting to add in the new code from
the source branch code not in conflict.

 

I'm willing to believe that this could be an operator error since if
this were a bug there would be quite a few others grumbling about this.
As it is, I can't rely on the merging facilities as I'm currently using
them. Any advise on how to go about debugging this?

 

Thanks,

Karl