为什么我得到这个错误尝试使用svn与git。我正在执行以下步骤并发生一些疯狂的错误。为什么我得到这个错误试图与svn使用git
git svn clone -s http://svn/java/project project
cd project
git svn show-ignore > .gitignore
git checkout -b dev
我得到outpput
M src/main/java/app.properties
M src/main/java/messages.properties
M src/main/java/org/xxxxx/enrollment/dao/projectDao.java
M src/main/resources/app.properties
M src/main/webapp/WEB-INF/flows/start/footer.jsp
M src/main/webapp/WEB-INF/flows/start/header_edit.jsp
M src/main/webapp/WEB-INF/flows/start/tobe.jsp
M src/main/webapp/WEB-INF/spring/mvc.xml
M src/main/webapp/index.jsp
M src/test/resources/app.properties
M src/test/resources/messages.properties
M src/test/resources/mvc.xml
Switched to a new branch 'dev
'
git svn rebase
我得到这个输出以下
src/main/java/app.properties: needs update
src/main/java/messages.properties: needs update
src/main/java/org/xxxx/enrollment/dao/projectDao.java: needs update
src/main/resources/app.properties: needs update
src/main/webapp/WEB-INF/flows/start/footer.jsp: needs update
src/main/webapp/WEB-INF/flows/start/header_edit.jsp: needs update
src/main/webapp/WEB-INF/flows/start/tobe.jsp: needs update
src/main/webapp/WEB-INF/spring/mvc.xml: needs update
src/main/webapp/index.jsp: needs update
src/test/resources/app.properties: needs update
src/test/resources/messages.properties: needs update
src/test/resources/mvc.xml: needs update
update-index --refresh: command returned error: 1
请帮我
在您尝试创建新分支之前,“master”中的'git status'是什么意思? – chepner 2013-02-11 20:52:23
您是否处于混合操作系统开发环境中,其中不同用户可能位于具有不同行结束约定(Windows vs Linux vs MacOS)的系统上? – twalberg 2013-02-11 22:19:32