imagingvur.blogg.se

When I start my merge with bash, it launches winmerge as expected and merges without any problems.

gitconfig is configured as follows: prompt = false keepBackup = false keepTemporaries = false tool = winmerge name = WinMerge.l cmd = 'C:/Program Files (x86)/WinMerge/WinMergeU.exe' -u -fm -wl -wr "$LOCAL" "$MEGED" "$REMOTE" Recently, I have encountered a roadblock that I can't seem to fix in the form of using git GUI to do a conflict merger using winmerge. I've started adding custom tools like deleteTag, whereIsOrigin, checkoutSingleFile, etc. I guess that's a win for our community!īut now, since all employees (not only devs) will use git, then I am now tasked to optimize Git GUI to be as non-techy-friendly as possible. Hi, so my company finally decided to move to git from perforce helix core.