Again.. don't store binaries that you generate during a build. It's an anti-pattern and there's no reason to do it.


>Thank you for the answers Lutz and Craig,0
>
>If the binaries are not stored they need to be regenerated when you check out a branch, but only if the associated text file changes during the checkout. Do you know a trick to automate this step? Perhaps git has a hook that makes this easy.
>
>Another approach is described in an article that explains how to make Git preserve specific files while merging. This way you can store VFP binary files and keep git from trying to merge them during a merge operation. It also avoids having to regenerate them. The article is https://medium.com/@porteneuve/how-to-make-git-preserve-specific-files-while-merging-18c92343826b#.25075jakz It requires you to indicate a process that does nothing and returns errorlevel 0. I found that a VFP exe works fine.
>
>Alex