>If there are conflicts that have to be resolved, how is that done, since the files
>are binary and not text based?


Binary files are replaced. There is no merge ability (at least not to my knowledge). This is one of the issues that an application like Visual FoxPro with its many table-based objects causes issues. Git was designed more for source code files like PRG files.

You will have pushes and pulls (code pushed from you to some remote server, or pulled to you from remote server) that will occasionally have conflicts. When you do, it will prevent you from pushing until those conflicts are resolved. You do this by pulling the latest atop your code. This will introduce markup text in the middle of the source file showing your changes, and the remote, and then you manually fix them up before you attempt another push.

You can see the steps here:
https://www.youtube.com/watch?v=zz7NuSCH6II

Basically:
You code
You add to the local git repository
You commit
You push

When other people make changes:
You pull

Hope this helps.

zz7NuSCH6II