今天获取git线上仓库代码报了这个错误:
camnpr@com:~/code/camnpr-api$ git pull
You have not concluded your merge (MERGE_HEAD exists).
Please, commit your changes before you can merge.
错误可能是因为在你以前pull下来的代码没有自动合并导致的.
有2个解决办法:
HTML(使用方法):
<link rel="stylesheet" type="text/css" href="cssmin.php?get=base,style1,style2,global&path=css/&v=20131023" />
<script type="text/javascript" src="jsmin.php?get=jquery-1.6.4.min.js,minjquery.js,minjquery.ui.js,test.js,global.js&path=js/&v=20131023"></script>