我已閱讀主題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