[Preventing locking across branches / forking]

Same issue here. Still not implemented. Will have to not use locks at all which is awful as merges are almost impossible here for certain files...

[Identical file diff still shows as changed item although preference setting should ignore them]

This also happens to me. Specifically with the ProjectSettings\boot.config and ProjectSettings\GvhProjectSettings.xml files which always get their timestamp modified but almost never change. It's super annoying to work with these and I also can't put them in the Ignore list. Can you help please?