Please help with a merge problem.

I'm doing well making, “Mari Bro.”  When I use Visual Studio and I have finished a feature I commit and push the new feature.  After this I have made it a habit to merge that branch into the master.  This works as expected, great!  But, when I try to do all this with the console:

$ git checkout <branch> 
$ git add .
$ git commit -m <“my message”>
$ git push
$ git merge master
----------------Conflicts generated here!------------
$ git checkout master
$ git checkout -b <new_branch>

I get many conflicts in the files (around 30-40.)  How do I get the files that are …