Hi Rick,

you are right with the lockings.
For the development side it's relative simple - I use this tool of mine what simply clears up the IDE to a state where nothing else is used (that is a CLEAR ALL is done, as you point out too) and takes care to create anything one need.
I do debuging in an additional IDE and what is open there might be a problem for commiting. Tables in use are the most common problem. But for that git will produce some error, so one can help oneself.

Checkout will fail with tables used - git will give a failure too.
Creating the binaries from the text is more prone to failure under such circumstances but again Claudios program will raise an error if a vcx is locked for some reason. I do this for some time now and it looks pretty stable.

I do git commiting on high frequency. It's a kind of addiditonal backup. One can later squeeze those endless commits into one commit what looks better in the history. So for that a project hook might be a bit late, on the other side sometimes I have to compile tiny changes I dislike to commit. So decoupling project from committing is my choice.

>Looks like you're on the right path.
>
>I still use Christof's TwoFox which does a similar thing to Fox2Bin. I simply have a PRG file I call SCC that is a Fox program that creates the text files from Fox binaries. It has a flag to do the reverse (turn them back into binaries) which I run after a Git Pull.
>
>The problem with all of this is that it's not super stable. if files are open things can be locked etc. which is a bitch. Using project hooks are a good way around this but I don't use projects much except for final builds so that doesn't really work for me.
>
>Ultimately you want to have a Build routine that can put your project into a stable commit state. This can be a PRG that clears and closes everything then creates the text files.
>
>Using DBF files for code seemed smart a long time ago, but man has this been a drag over the years and an endless source of hacks and it's one reason I avoid classes, forms, etc. like the plague. Luckily for Web Connection we don't need binaries much.
>
>+++ Rick ---
>
>
>>Hi,
>>
>>I am using Fernando Bozzo's excellent FoxBin2Prg program to convert VFP's binary files (scx/sct, vcx/vct, etc) to text files and back in order to merge changes between branches. In order to make it easier to start with Git I am using SourceTree as a graphical interface, which is only a layer that uses Git to do all the work, so the messages I am getting are Git messages.
>>
>>When merging two branches I am getting this type of message:
>>
>>CONFLICT (rename/delete): comun/FORMS/ALERTLIS.SC2 deleted in HEAD and renamed in master. Version master of comun/FORMS/ALERTLIS.SC2 left in tree.
>>
>>Files ending in SC2 are generated text versions of the SCX/SCT file pair.
>>
>>Does anyone here know what do these messages mean and how to respond? Unfortunately for me, Fernando uses a different source control program, not Git.
>>
>>Somewhere I read that Git is able to tell that a file has been renamed, which makes me wonder if it would be able to tell that the generated SC2 files were the result of two different generations and somehow be confused by that.
>>
>>I'd appreciate any help.
>>
>>Alex