爲什麼我得到這個錯誤嘗試使用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