diff options
Diffstat (limited to 'tags/d/debian-adds-svn-conflict-file.tag')
| -rw-r--r-- | tags/d/debian-adds-svn-conflict-file.tag | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/tags/d/debian-adds-svn-conflict-file.tag b/tags/d/debian-adds-svn-conflict-file.tag new file mode 100644 index 0000000..fc170c2 --- /dev/null +++ b/tags/d/debian-adds-svn-conflict-file.tag @@ -0,0 +1,10 @@ +Tag: debian-adds-svn-conflict-file +Severity: warning +Check: files/artifact +Renamed-From: + diff-contains-svn-conflict-file +Explanation: The Debian diff or native package contains a file that looks like a + Subversion conflict file. These are generated by Subversion when a + conflict was detected while merging local changes with updates from a + source repository. Use <code>svn resolved</code> to remove them and clear + the Subversion conflict state after you have resolved the conflict. |