I receive a very annoying bug whenever I ask for help from another employee to look at a file.
I check in my changes.
They review, make a change.
I'm not aware they made a change, so make a change and build.
"File has pending server changes. Please pull first." File is TWS_Sync_Data.
So I Pull... updates the file... then I build... same error... rinse and repeat.
Before the update I was able to just go into the project file, find 2 entries for tws_sync_Data and delete the oldest one to continue. Not ideal, but it worked for the meantime. Now I can't even do that as there is only one entry.
I've wasted an hour so far pulling and pushing for the same file.