This is a difficult question for many people. I found a good way out of this situation. After a long search, I managed to find a convenient merge tool devart.com/codecompare/ which integrates with version control systems such as: TFS, SVN, Git, Mercurial, and Perforce. In addition, Code Compare is supplied as a separate file comparison tool, and as a Visual Studio extension.
For further actions, you may consider blocking this person and/or reporting abuse
This is a difficult question for many people. I found a good way out of this situation. After a long search, I managed to find a convenient merge tool devart.com/codecompare/ which integrates with version control systems such as: TFS, SVN, Git, Mercurial, and Perforce. In addition, Code Compare is supplied as a separate file comparison tool, and as a Visual Studio extension.