I use Linux on my home desktop and my work desktop but I also keep a Windows install on my work machine when I need to test Windows things there. On Windows, I haven’t found a better Git GUI than fork.dev. It’s not open-source but it is what one of my favorite creators calls “organic software”: Ukrainian husband and wife duo that warms my heart. The evaluation period is unlimited without nags. I’ve found it to be the perfect Git teaching tool and the best merge conflict resolver I’ve ever seen.
Have you had a merge conflict yet? A breeze to manage with GH Desktop + VSC
A merge conflict is a breeze to handle in the terminal. I haven’t seen any tools that improve on that substantially.
5 years of merging conflicts, I still don’t know when to use --theirs or --ours
This is the first I’m hearing of those flags. Is it a way of specifying commits without knowing the hash?
I still use TortiseGit just for merge conflicts. The editor is more intuitive to me.
I’ve done it with vsc, haven’t used GH desktop do you use it alongside vsc or does it just do a similar thing?
I use Linux on my home desktop and my work desktop but I also keep a Windows install on my work machine when I need to test Windows things there. On Windows, I haven’t found a better Git GUI than fork.dev. It’s not open-source but it is what one of my favorite creators calls “organic software”: Ukrainian husband and wife duo that warms my heart. The evaluation period is unlimited without nags. I’ve found it to be the perfect Git teaching tool and the best merge conflict resolver I’ve ever seen.