DEV Community

Mahbubur Rahman
Mahbubur Rahman

Posted on

SVN time out conflict issue when commit

To resolve all tree conflicts by keeping your local working copy version (using svn resolve --accept=working), you can automate the process with the following commands:

Steps to Resolve All Tree Conflicts

  1. Run the Cleanup Command (optional but recommended):
    • Make sure there are no pending operations before proceeding with the resolution. 
svn cleanup
Enter fullscreen mode Exit fullscreen mode

2.Resolve All Conflicts Using svn resolve:
You can resolve all tree conflicts in the current directory and its subdirectories with this command:

svn status | grep '^C' | awk '{print $2}' | xargs -I {} svn resolve --accept=working {}
Enter fullscreen mode Exit fullscreen mode
  1. Revert Any Pending Changes (if desired): If you want to make sure there are no other modifications to be considered, run: 
svn revert -R .
Enter fullscreen mode Exit fullscreen mode

Update to Ensure Everything is in Sync:
After resolving all conflicts, run:

svn update
Enter fullscreen mode Exit fullscreen mode

Top comments (0)