Dealing with a ton of merge conflicts lately, multiple teams keep touching the same files 😅

What tools do you use to resolve git merge conflicts? Are you using something built into your IDE, a standalone diff tool, or just suffering through the CLI Vim like me?

#Git #MergeConflict #SoftwareEngineering #DevTools #OpenSource #Programming #100DaysOfCode