1

为什么我在尝试将 git 与 svn 一起使用时出现此错误。我正在执行以下步骤并遇到一些疯狂的错误。

git svn clone -s http://svn/java/project project
cd project
git svn show-ignore > .gitignore
git checkout -b dev

我得到以下输出

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

请帮我

4

1 回答 1

0

如twalberg所述，并在issue 103中说明，请确保在克隆和变基之前键入：

git config --global core.autocrlf false

您不希望 git 自动更改任何内容（如“错误变基/更新git-svn存储库”）。

于 2013-02-12T06:55:16.883 回答