>>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
>
>This looks rather tricky. HEAD and master branch are mixed up due to a renamed/created file
>http://stackoverflow.com/questions/3100032/git-rename-delete-confusion gives some insight.
>
>also google for git rename/delete conflict
>
>pro tip:
>
>if you copy your whole projcet (that is, the directory where .git is located in) anything you start playing with is secure.

Problem is solved, probably with item 2 below.

1) Since git uses the SHA-1 hash as key of a file, it can tell if it changes name. One author asked what defines a file, the name or the content?

2) I want to keep in the repository all VFP binary files together with the text file created by FoxBin2Prg program, but I don't want git to attempt to merge the binary files. There is a way to do that explained here: https://medium.com/@porteneuve/how-to-make-git-preserve-specific-files-while-merging-18c92343826b#.25075jakz It uses a hook that git provides to call a procedure during merges (there are other hooks too). I created a VFP exe for that purpose, with which I intend to do further work.

3) I also had several projects in separate directories that I wanted to consolidate in a single repository. These were variations of our main product which we normally merge by hand ( que horror! ). Since I mark all changes of a series with the same code, I wrote a program to import to a new branch all files of a file group (e.g. SCX / SCT / SC2 files) even if only one of them had the code of interest. Program available if anyone needs it. Merging branches with git is a separate step.

In summary there is a lot to learn here, but well worth the effort.

Thank you Fernando Bozzo and Linus Torvalds for these wonderful tools.

Alex