Git Question
-
I've been using GitHub Desktop (published by GitHub) to manage my Visual Studio source code. I want to use WinMerge with Github Desktop. Must I install Git itself to use a merge tool?
The difficult we do right away... ...the impossible takes slightly longer.
-
I've been using GitHub Desktop (published by GitHub) to manage my Visual Studio source code. I want to use WinMerge with Github Desktop. Must I install Git itself to use a merge tool?
The difficult we do right away... ...the impossible takes slightly longer.
I don't have an answer to your specific question, but I find handling git actions using Visual Studio's built-in git UI the easiest way to use git. I can do so much that I could never figure out by using git command-line.
There are no solutions, only trade-offs.
- Thomas SowellA day can really slip by when you're deliberately avoiding what you're supposed to do.
- Calvin (Bill Watterson, Calvin & Hobbes) -
I've been using GitHub Desktop (published by GitHub) to manage my Visual Studio source code. I want to use WinMerge with Github Desktop. Must I install Git itself to use a merge tool?
The difficult we do right away... ...the impossible takes slightly longer.
-
I've been using GitHub Desktop (published by GitHub) to manage my Visual Studio source code. I want to use WinMerge with Github Desktop. Must I install Git itself to use a merge tool?
The difficult we do right away... ...the impossible takes slightly longer.
I don't use GitHub Desktop, but according to their [docs](https://github.com/git-guides/install-git) they say it'll install Git itself if it's not already installed. A quick and easy way to verify this is to go to a command prompt and type in `git -v` and see what you get. As far as the WinMerge side, I'd be surprised if it shipped with git. But, GitHub Desktop does, so you should have it.
Jeremy Falcon
-
I've been using GitHub Desktop (published by GitHub) to manage my Visual Studio source code. I want to use WinMerge with Github Desktop. Must I install Git itself to use a merge tool?
The difficult we do right away... ...the impossible takes slightly longer.
Oh worst case scenario, you may have to put GH Desktop's version of Git in your path. But, better than installing Git twice.
Jeremy Falcon
-
I've been using GitHub Desktop (published by GitHub) to manage my Visual Studio source code. I want to use WinMerge with Github Desktop. Must I install Git itself to use a merge tool?
The difficult we do right away... ...the impossible takes slightly longer.
In GitHub Desktop, you can resolve conflicts by using the built-in merge tool, see: Github Desktop Resolve Conflicts[^]
-
In GitHub Desktop, you can resolve conflicts by using the built-in merge tool, see: Github Desktop Resolve Conflicts[^]
Does it do a 3-way merge?
Jeremy Falcon
-
Does it do a 3-way merge?
Jeremy Falcon
No idea, I don't use GitHub Desktop myself, found this information by Googling.
