>>Question... if there are conflicts that have to be resolved, how is that done, since the files are binary and not text based?
>
>I don't know about Git, but I'm using Mercurial, where you can hook up your choice of comparison tool. I use Beyond Compare and with Frank Perez's add-in, it handles VFP's binaries just fine. Perhaps Git has a similar facility.
>
>Tamar


Git uses what are called "deltas" to identify changed portions. This works in binary files as well, with only those portions which are changed being written. It's like how patches work against .exe files.

I just don't know of a way to view the binary diffs in the case of merge conflicts. I would actually like to know how to do this as well. :-)