>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.