If you're right about your colleagues (and that's a big if, because you might not be) ask them for help. Having access to people who can mentor you to improve i

If you're right about your colleagues (and that's a big if, because you might not be) ask them for help. Having access to people who can mentor you to improve is by far the best way to learn for most people. Next time you have an issue, don't just try to solve it with your familiar tools, but reach out to them and say what the issue is, that you want to learn, and ask if they can help. If they're good devs they'll be more than willing. All that aside though, the new three way merge editor in VSCode is amazing. Why wouldn't you use that to resolve conflicts?