you are viewing a single comment's thread
view the rest of the comments
[–] 13 points 2 years ago (1 child)

Do it enough times and it stops being scary.

Using a tool like VSCode to perform the actual merges on individual files also helps because it shows what "yours" and "theirs" changes are from a user perspective, not a git perspective

  • source
  • parent
  • hideshow 1 child comment