On Wed, 5 Oct 2016 05:42:27 -0700 (PDT) Croqueur Fou <vincent.le.croqu...@gmail.com> wrote:
> Thanks Philip > Thanks Konstantin, > > I tried the utility setting the modified date of the file to the > checkout time. It works but can't help in my case. > > I understand that there is no way to make Winmerge / Freefilesync (or > other tools based on date comparisons) work with git. > > I will try to convince my team to jump from winmerge to git. Note that Git implements a relatively flexible framework for doing interactive merging, and it appears it's possible to use WinMerge with Git rather natively. Basically you configure Git on each developer's workspace to use WinMerge as the Git's "merge tool", then do merging "the usual way" -- by calling `git merge <whatever>` -- and if a conflict happens, you call `git mergetool` which pops WinMerge up to let the developer sort the conflict(s) out. Hence it should get you the best of both worlds. Please google for git+mergetool+winmerge and do some research if you're interested. -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
