Linux

48216 readers

710 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

AgreeableLandscape@lemmy.ml

nooter692@lemmy.ml

MarcellusDrum@lemmy.ml

cypherpunks@lemmy.ml

cyclohexane@lemmy.ml

d3Xt3r@lemmy.nz

370

Most of us hate Microsoft, and yet many of us use VSCode (lemm.ee)

submitted 1 year ago by flashgnash@lemm.ee to c/linux@lemmy.ml

449 comments fedilink hide all child comments

I get that it's open source provided you use codium not code but I still find that interesting

you are viewing a single comment's thread
view the rest of the comments

[–] glowie@infosec.pub 3 points 1 year ago (4 children)

Have you had a merge conflict yet? A breeze to manage with GH Desktop + VSC

[–] intensely_human@lemm.ee 7 points 1 year ago (1 children)

A merge conflict is a breeze to handle in the terminal. I haven’t seen any tools that improve on that substantially.

[–] OsrsNeedsF2P@lemmy.ml 3 points 1 year ago (1 children)

5 years of merging conflicts, I still don't know when to use --theirs or --ours

[–] intensely_human@lemm.ee 1 points 1 year ago

This is the first I’m hearing of those flags. Is it a way of specifying commits without knowing the hash?

[–] flashgnash@lemm.ee 1 points 1 year ago

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?

[–] worldofgeese@lemmy.world 1 points 1 year ago* (last edited 1 year ago)

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.

[–] ExtraMedicated@lemmy.world 1 points 1 year ago

I still use TortiseGit just for merge conflicts. The editor is more intuitive to me.