this post was submitted on 09 Nov 2023
1228 points (98.2% liked)

Programmer Humor

32558 readers
438 users here now

Post funny things about programming here! (Or just rant about your favourite programming language.)

Rules:

founded 5 years ago
MODERATORS
 
you are viewing a single comment's thread
view the rest of the comments
[–] boomzilla@programming.dev 2 points 1 year ago

The 3-way merge editor in VSCode is a fantastic tool. Really helps in visualizing what comes from where and preventing merge accidents.