MyEclipse Resolving SVN sync conflict Conflict in the working copy obstructs the current operation

Source: Internet
Author: User

Server version control software subversion, the client is the Eclipse plugin subclipse. When deleting a thing always prompt error, say conflict

Commit-m "" C:/users/administrator/workspaces/myeclipse 8.6/aisinonew/webroot/htmljs/sale_protocol.js
A conflict in the working copy obstructs the current operation
Svn:commit failed (details follow):
Svn:aborting commit: ' C:\Users\Administrator\Workspaces\MyEclipse 8.6\aisinonew\webroot\htmljs\sale_protocol.js ' remains in conflict

Solutions

Right-click the directory you want to delete –>team–>show tree conflict–> in eclpise a tab view displays the contents of the tree Conflict, a conflict in a select list right-click to mark it as resolved, Then return to the project and commit the changes.

Successful display:

Resolve--accept=working C:/users/administrator/workspaces/myeclipse 8.6/aisinonew/webroot/htmljs/sale_ Protocol.js
Resolved conflicted state of C:/users/administrator/workspaces/myeclipse 8.6/aisinonew/webroot/htmljs/sale_ Protocol.js

MyEclipse Resolving SVN sync conflict Conflict in the working copy obstructs the current operation

Contact Us

The content source of this page is from Internet, which doesn't represent Alibaba Cloud's opinion; products and services mentioned on that page don't have any relationship with Alibaba Cloud. If the content of the page makes you feel confusing, please write us an email, we will handle the problem within 5 days after receiving your email.

If you find any instances of plagiarism from the community, please send an email to: info-contact@alibabacloud.com and provide relevant evidence. A staff member will contact you within 5 working days.

A Free Trial That Lets You Build Big!

Start building with 50+ products and up to 12 months usage for Elastic Compute Service

  • Sales Support

    1 on 1 presale consultation

  • After-Sales Support

    24/7 Technical Support 6 Free Tickets per Quarter Faster Response

  • Alibaba Cloud offers highly flexible support services tailored to meet your exact needs.