我已阅读主题How to resolve merge conflicts in Git? 但我不知道具体如何解决我的问题。我该如何解决合并冲突git
$ git fetch master
$ git pull origin master
From https://github.com/BruceleeThanh/StudentManager
* branch master -> FETCH_HEAD
Updating : 43726eb......7c5fe6a
error: Your local changes to the following files would be overwritten by merge :
BusinessLogic/UserBO.cs
SchoolManager/Entity/UserEN.cs
Please, commit your changes or stash them before you can merge .
Aborting
帮帮我。请 !
您应该'git-commit'您的更改或['git-stash'](http://git-scm.com/docs/git-stash)它们。 – NightShadeQueen