399
you are viewing a single comment's thread
view the rest of the comments
view the rest of the comments
this post was submitted on 07 Oct 2023
399 points (90.1% liked)
Linux
48335 readers
895 users here now
From Wikipedia, the free encyclopedia
Linux is a family of open source Unix-like operating systems based on the Linux kernel, an operating system kernel first released on September 17, 1991 by Linus Torvalds. Linux is typically packaged in a Linux distribution (or distro for short).
Distributions include the Linux kernel and supporting system software and libraries, many of which are provided by the GNU Project. Many Linux distributions use the word "Linux" in their name, but the Free Software Foundation uses the name GNU/Linux to emphasize the importance of GNU software, causing some controversy.
Rules
- Posts must be relevant to operating systems running the Linux kernel. GNU/Linux or otherwise.
- No misinformation
- No NSFW content
- No hate speech, bigotry, etc
Related Communities
Community icon by Alpár-Etele Méder, licensed under CC BY 3.0
founded 5 years ago
MODERATORS
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.