合并分支时, 冲突了, 怎么解决啊?
$ git merge sign-up
Updating fd8a1db..e4ba31b
error: Your local changes to the following files would be overwritten by merge:
sample/public/css/app.css
Please commit your changes or stash them before you merge.
Aborting
解决了
master上, 有新代码没有提交, add && commit后, 再merge, 成功了!
推荐文章: