I'm using GitExtensions windows software to work with git and i had many trouble configuring it to work with Idea's community edition, to use it as a merge tool.
I've installed version 2022.1 of intelliJ Idea community
I followed the instructions here https://coderwall.com/p/gc_hqw/use-intellij-or-webstorm-as-your-git-diff-tool-even-on-windows but it didn't worked for me for conflict resolution
i went to the folder c:\users<login> to edit the .gitconfig file
and i added the following sections in it
[merge]
tool = intellij
[mergetool "intellij"]
cmd = cmd.exe //c "\"C:/Program Files/IntelliJ IDEA Community Edition 2022.1/bin/idea.bat\" merge \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\""
trustExitCode = true
but nothing was launched when launching the mergetool
Related
I tried editing my C:\ProgramData\Git\config file, but that had no effect. I used to have WinMerge configured as my merge tool in Visual Studio, but I switched to the new built-in tool and didn't like it and now I can't get my WinMerge back! Help!
Here's what I added to the config file:
[merge]
tool = winmerge
[mergetool "winmerge"]
cmd = \"C:\\Program Files\\WinMerge\\WinMergeU.exe\" \"$REMOTE\" \"$LOCAL\" \"$BASE\" \"$MERGED\"
Is there another config file, say, one for my user profile, overriding this global file?
Aha! There was another config file. It was located at C:\Users(me).gitconfig.
I have Windows10 with the Ubuntu bash and Visual Studio Code.
Every time I start Visual Studio Code it prompts a warning saying:
Git not found. Install it or configure it using the 'git.path' setting
I got git actually installed through the bash terminal:
# which git
/usr/bin/git
How can I instruct Visual Studio Code to use that git installed in the bash terminal?
I have tried through the git.path setting but I am not sure how to set the path to something that is relative to the bash terminal.
If you're running Visual Studio Code on Windows, you also need to install Git for Windows. VsCode currently can't access git on the linux subsystems.
I wan't to use Visual Studio 2017 (15.5) together with a Git repository which tracks some files with Git LFS.
I already have Git 2.15, which contains Git LFS, installed on the machine.
I've Visual Studio 2017 installed with only the following workloads and without the Git component since it already is available on the machine:
--add Microsoft.VisualStudio.Workload.ManagedDesktop
--add Microsoft.VisualStudio.Workload.NetWeb
--add Microsoft.VisualStudio.Workload.NetCoreTools
--add Microsoft.VisualStudio.Component.Wcf.Tooling
Visual Studio fails now to checkout branches from the repository since it cannot find Git LFS.
I assume this is because git-lfs.exe is not available on the path, and Visual Studio has its own Git instance in c:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\Git\mingw32\bin\.
If I additionally install the standalone git-lfs installer, which makes git-lfs available on the path, checkout works on some machines but not on other (haven't found out what's the difference, maybe installation order or if it was a new installation or update of Visual Studio).
If I remove the c:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\Git\ folder everything works fine in Visual Studio, as it does use the Git version available from the path.
My questions are:
What is the supposed way to have Git LFS support in Visual Studio?
Is there a way to have Visual Studio using the Git Version on the path instead of installing its own instance
Does Visual Studio expect git-lfs on the path or should it also work with Git LFS installed through the bundled installer in recent versions of Git for Windows.
To get Git LFS working with Visual Studio 2017 (15.5.2) it requires Git LFS installed with the standalone Git-LFS installer. If Git LFS is installed with the Git for Windows distribution git-lfs.exe is not available on the PATH, and since Visual Studio has its own instance of Git, LFS functionality won't work.
It is also important to have Git LFS early in the path otherwise it won't be passed to Git by Visual Studio as the PATH passed to the Git instance run by Visual Studio is limited in the length. For example installing Git LFS after Visual Studio often ends with git-lfs.exe too late in the PATH.
Git for Windows was installed as part of Visual Studio 2013. I think it is version 1.8.3 if I remember correctly. There are newer versions available. Is it safe to update git or will internal setting of Visual Studio get corrupted?
I had Git for Windows installed before I installed VS2013. I've been running 1.9.4 the whole time and never had an issue with VS2013 interfacing with Git. Updating Git externally of VS shouldn't be a problem, most likely VS just interfaces with a known Git repository and doesn't have a dependency on the Git version it self. If the newer version of Git has a new feature you want to use and VS doesn't support it then VS won't break, you will just have to run the command through the Git instead of through the VS GUI.
I want to use Tortoise SVN diff utility with TFS. I know how to configure user tools in TFS. What I need is installer for Tortoise SVN diff utility. I think I need to install full Tortoise SVN to get SVN diff tool, is there a standalone version of this tool available for download?
I know various other diff tools are available like winMerge etc. but I am very much familiar with tortoise svn diff.
If you want to use Tortoise Merge with TFS. You need to install Tortoise SVN.
And then follow the steps here
Compare Command: C:\Program Files\TortoiseSVN\bin\TortoiseMerge.exe
Arguments:
/base:%1 /mine:%2 /basename:%6 /minename:%7
Merge
Command: C:\Program Files\TortoiseSVN\bin\TortoiseMerge.exe
Arguments: /base:%3 /mine:%2 /theirs:%1 /basename:%8 /minename:%7 /theirsname:%6 /merged:%4 /mergedname:%9
The TSVN diff tools are available separately.
See the download page, scroll down to "Tools".
Or directly from here.