Dear Tamar,

After half a decade of git I must admit that you learn command line or pray.

Anyway, I do not see what you try to achive. Any ??X file can not be compared because its binary? Also, from a git POV it is wrong to store ??X files and the memos at all. It will blow the repo. That's the reason for FoxBin2PRG - and store the ??2 files only. The ??2 will work with any compare tool because of there text nature.
I'm reluctant for the DBF and DBC - but I have not tried the compare function there.

If you can do that (including FoxBin2PRg into your workflow) almost any GUI will do - if don't do to tricky stuff.
Anyway, I prefer bash, and my personal choice UltraCompare for comparision. But this is a matter of choice.

I'm sorry for the missing session - the workflow was one of the ideas ...

Let me know if there is more help you need.

>Until last year, I'd been happily using Mercurial for years. But Bitbucket, my web repository, dropped support for Mercurial last year and I switched to Git rather than moving to another provider. I've been tearing my hair out ever since because I cannot find a front-end tool for Git that is anywhere near as easy to use and helpful as Hg Workbench is for Mercurial.
>
>Let me start by saying that I DO NOT want to work at the command line. If I have to do that, I will end up not saving things to the repository. The appeal of Mercurial in the first place was that it was the first example of a version control system that didn't make it hard to use version control.
>
>I've tried Git GUI that installs with Git and found it impenetrable. I'm now trying Sourcetree and it seems easier to work with. But I'm having one major problem. I use BeyondCompare with Frank Perez's VFP add-in to do diffs and merges, but Sourcetree doesn't seem to be able to handle VFP's X files (SCX, VCX, etc.) In Hg Workbench, if I highlighted both the SCX and SCT or VCX and VCT and chose a diff, it worked seamlessly. I'd get a comparison that worked perfectly.
>
>Sourcetree doesn't seem to have that capability. I've asked Frank and he even sent me the code for the add-in, but I don't see a way to configure Sourcetree to understand it should pass the two files together.
>
>So is anyone using a Git UI that is straightforward and can do these comparisons?
>
>Guess I need to add that yes, I know I can switch to using one of the tools that converts between X files and text, but that raises two problems. First, I have to remember to do it and to do it in the right direction each time. Experience with another project where we do that has convinced me that I won't get it right.
>
>Second, I have years of version control history for the relevant projects and this would create a breakpoint before which I can't do the comparison.
>
>Fundamentally, I just want what I had and so far, I can't seem to get it from Git. (To be honest, I don't understand why it won. It's so much hard to use than Mercurial. I've had to kill and recreate local repositories multiple times because it's so frigging hard to use.)
>
>Tamar