Where I work, there are several different teams all working on the same code base and merge conflicts are frequent. Also, it happens that more than one person may be making improvements to the same chunk of code and not be aware of the other person's work until it comes to merge it.
Is there any sort of tool or methodology for dealing with this situation?
I'm using VSCode and was thinking it'd be really helpful if there was a plugin to highlight code that was changed in a pending pull request or an unmerged branch with recent commits. Or perhaps a bot in github that would comment on your PR about another PR that conflicts with yours.