I have a Data Tools project with github on Visual Studio. When I commit my changes, .jfm files show up and they often conflict when I am pulling changes from others.
When I accept .jfm files from others, I lose my changes.
What are those files? How should they be managed?