▲ 1276 ▼ I'm going to sit down and actually learn git this week (midwest.social) submitted 2 years ago by seahorse@midwest.social to c/programmerhumor@lemmy.ml 82 comments fedilink hide all child comments
[–] jack@monero.town 28 points 2 years ago (3 children) Solving merge conflicts or rebasing is not simple permalink fedilink source parent hideshow 3 child comments replies: [–] lightnegative@lemmy.world 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 permalink fedilink source parent hideshow 1 child comment replies: [–] boomzilla@programming.dev 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 [–] buzziebee@lemmy.world 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. permalink fedilink source parent
[–] lightnegative@lemmy.world 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 permalink fedilink source parent hideshow 1 child comment replies: [–] boomzilla@programming.dev 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
[–] boomzilla@programming.dev 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
[–] buzziebee@lemmy.world 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. permalink fedilink source parent