New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

svn命令解决所有文件树冲突 #5

Open

natee opened this issue Dec 6, 2014 · 0 comments

Labels

Owner

natee commented Dec 6, 2014

在svn命令行merge之后文件经常会出现local add, incoming add upon merge问题，导致无法提交，可以通过以下命令解决冲突，可以用以下命令解决。

svn resolve --accept working -R .

The text was updated successfully, but these errors were encountered:

natee added the svn label

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment