I'm trying merge my branches, but I get the error merge completed with conflict http://prntscr.com/936x6n (as u see even with git gui i can't)
I tried skip database. So i added to .gitignore .mdf and .ldf, but still nothing. I can't merge branches. What should I do?