Hi,
I am using PB2017 R3 Build 1915.
I am trying to merge a feature branch and develop branch together. I received a number of conflicts (which was expected), and worked through resolving the conflicts (outside of the PB IDE). I committed my merge conflict resolutions to the branch and now i want to have the changes show in PB.
My understanding of things is that I need to refresh the target/workspace and do an incremental build and all will be right with the world.
However, refresh gives an error each time, see attached compile_failure.PNG. Clicking ok doesn't do much, it seems to stop the refresh - it jumps from "Importing" to the "Successful get of ..." section.
Inspecting the objects, or even just the first one that the error came up for ("Importing datawindow.srd..."), with edit source or edit shows that the latest changes have not been refreshed.
Refreshing multiple times does seem to work it's way through other objects, still failing but on the next object. But again, inspecting the code shows that the changes have not been refreshed (imported) into the PBLs.
Has anyone encountered this issue? Have I done something horribly wrong (other than choosing to program for a living - lol, that's where I'm at now)?
Thanks,
Dan
In fact, between one of the .sru files it was failing on and one from a workspace with no issues, they are exactly the same, at the byte level.