many modern IDEs will help with this, ie. visual studio code. It will highlight and name the conflicting code by branch. When the conflict occurs you can do g

many modern IDEs will help with this, ie. visual studio code. It will highlight and name the conflicting code by branch. When the conflict occurs you can do git status and the highlighted files are those with a conflict -- at that point you can just navigate there in the code editor of your choice and look for the <<<< blocks. After you get those files into the state you would like then you run 'git commit' to resolve.