Hello:

We moved to Git SCC about 2.5 months ago.  One of our developers is experiencing an issue where it isn't saving the change.  It is a simple change to an attribute - changing the background color of an object.  In trying to resolve the situation I noticed the following:

• Files exported from PB & opened in Notepad++ have the UCS-2 LE BOM encoding
• Files in the ws_objects folder are encoded in UTF-8-BOM

Can you tell me if this is supposed to be this way, or are they supposed to have the same encoding?  Does it matter?  I ask because when we exported the object that wasn't saving, edited the encoding to match what was in the ws_objects folder, saved and imported back in, made the change, it saved and showed the green checkmark.  The developer committed their change.

But after the developer rebased to master, the attribute change wasn't there again.

I am new to Git and do not generally mess with encoding - but we did a diff on the exported object vs the object in ws_object to see if we could spot a difference.  In P4Merge the only difference we saw was spacing.  So I wondered if it was a configuration issue.  The developer prefers Notepad++ so we tried to do a diff using that, and it failed because the encoding was different.  That's what lead me down the encoding path.

The developer has also done a full rebuild.

I may be down a rabbit hole so I am reaching out for help.

1.  To get a high level view of why an export from PB has different encoding than ws_objects

2.  To see if you have any suggestions about resolving the issue.

Sorry about the verbosity, but I felt by giving more information up front I would save everyone time on the back end.

Thanks.

MJ