I use Visual Studio’s integration with GIT to store my repository on GitHub.

I just merged a branch into master. Both the branch and the master had data migration changes. Before I merged, I was given a notice that there may be a conflict. I went ahead, assuming that I would have a chance to correct any conflicts if indeed they did occur.

Instead, it just went ahead and silently merged everything. And now I see one of my data migration files is gone!

This is not the first time I’ve lost data during a merge. Isn’t there a way to have Visual Studio let me resolve any conflicts instead of just deleting my files?