gitconfig, I still needed to keep that drive mapped (i.e. And then I also noticed that even after Sourcetree updated my. I remapped it in cmd with the command "subst %USERPROFILE%", then closed and re-opened Sourcetree, changed my diff/merge tool at that point, which successfully updated my. The Base (common ancestor) panel is extremely helpful for complex merges where both Left and Right. KDiff uses a 4 panel system, showing Left, Right, Base (very important) at the bottom. My workaround was to remap my network drive to my home/user directory (since my organization has since quit using that mapped network drive anyways, but I didn't want to redefine those variables to be safe, since they were probably set by Active Directory). For modern version control systems, 3way merge support is a basic requirement, but many other open source diff viewers do not adequately handle 3way merges. My organization had set %HOMEDRIVE%%HOMEPATH% to a network drive location ( probably via Active Directory), which caused this problem for me. But I think maybe they should have used %USERPROFILE% instead.
#Beyond compare command line windows#
I think that Sourcetree assumes that %HOMEDRIVE%%HOMEPATH% points to your Windows user folder, where your.
I feel like the root of the issue is sourcetree is not writing to the global git config correctly, is it supposed to?Īny suggestions? Running sourcetree version 3.0.17 beta 2660, was running 3.0.12 I think before this. But when running from within sourcetree the process log showsįatal: external diff died, stopping at /Properties/launchSettings.json I can see beyond compare making the call git -c diff.mnemonicprefix=false -c core.quotepath=false -no-optional-locks d ifftool -y -tool=sourcetree raptor_kubedbg.xml I've manually added diff tools to it and it works from command line.Ĭmd = 'C:\\Program Files\\Beyond Compare 4\\BCompare.exe' \"$LOCAL\" \"$REMOTE\" I have "allow source tree to modify global git config" checked.īut I never see the. I have beyond compare selected in source tree options, I've tried multiple, win merge. External diff stopped working recently for me.
0 kommentar(er)
