git merge conflicts: what to do when git yells at you

Let’s say you are doing a merge and then git yells at you: there is a conflict. What do you do? Well, whatever you do, do not panic. This is normal. 😅 It just means that two people, two AI agents, you and an AI agent, or whatever setup is working on the code changed the same lines in your repo. Git on its own cannot decide which changes to keep, so it needs you to tell it what to do. Open the…