1276
I'm going to sit down and actually learn git this week (midwest.social)
submitted 2 years ago by to c/programmerhumor@lemmy.ml
82 comments fedilink hide all child comments
 
you are viewing a single comment's thread
view the rest of the comments
[–] 2 points 2 years ago

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

  • permalink
  • fedilink
  • source
  • parent