Home/ Questions/Q 3498030
In Process

The Archive Base Latest Questions

Editorial Team
  • 0
Asked: 2026-05-18T12:26:36+00:00

I received this message when I ran a SVN UP: Skipped ‘trunk/scripts/accountability_survey_report.php’ At revision

  • 0

I received this message when I ran a SVN UP:

Skipped 'trunk/scripts/accountability_survey_report.php'
At revision 1585.
Summary of conflicts:
  Skipped paths: 1

I’ve been googling trying to figure out exactly what this means and how to resolve it. I tried deleting the file and then just svn up again, but I get the following:

Restored 'trunk/scripts/accountability_survey_report.php'
Skipped 'trunk/scripts/accountability_survey_report.php'
At revision 1585.
Summary of conflicts:
  Skipped paths: 1

Any help is appreciated.

Share

Leave an answer

You must login to add an answer.

Need An Account,

1 Answer

  1. Editorial Team

    Some more info, trying to deduce what happened, I found this error message when doing a svn info FILENAME Tree conflict: local delete, incoming edit upon update and this one: Tree conflict: local obstruction, incoming add upon merge I found this post that fixed my problem: http://little418.com/2009/05/svn-local-obstruction-incoming-add-upon-merge.html

    • 0