you are viewing a single comment's thread
view the rest of the comments
[–] 28 points 2 years ago (3 children)

Solving merge conflicts or rebasing is not simple

  • source
  • parent
  • hideshow 3 child 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
  • [–] 2 points 2 years ago

    It's doable once you know what you're doing. I can do it all via the cli, but I personally use gitkraken most of the time and it's just so much easier and more ergonomic.

    I also see a lot of the Devs who insist they know what they're doing create horrible messes of their branches super easily via the commit tree. People should just use whatever works best for them to get the job done.

  • source
  • parent