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
Especially when your coworkers are constantly rebasing their feature branches on other feature branches and you end up having to replay the same commits like seven times to get things aligned.
That’s when I start just cherry picking the commits in the right order into a “fuck you” branch. This is also the only time I ever use the blame feature.
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.
Solving merge conflicts or rebasing is not simple
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
The 3-way merge editor in VSCode is a fantastic tool. Really helps in visualizing what comes from where and preventing merge accidents.
Especially when your coworkers are constantly rebasing their feature branches on other feature branches and you end up having to replay the same commits like seven times to get things aligned.
That’s when I start just cherry picking the commits in the right order into a “fuck you” branch. This is also the only time I ever use the blame feature.
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.