How can I solve exactly in merge conflicts git -

i read topic how resolve merge conflicts in git? don't know how can rolve problem.

$ git fetch master  $ git pull origin master  https://github.com/bruceleethanh/studentmanager  * branch                       master        ->      fetch_head  updating : 43726eb......7c5fe6a  error: local changes following files overwritten merge :  businesslogic/userbo.cs  schoolmanager/entity/useren.cs   please, commit changes or stash them before can merge . aborting 

help me. please !

if local changes not committed have commit them first or stash them.

git stash clear // clear previous stashes git stash // save local changes git pull origin master // pull branch git stash apply // apply local changes 

after if have conflicts resolve them , commit again.