Mercurial Repositories > eric / file diff

--- a/src/eric7/VCS/VersionControl.py	Tue Apr 16 15:47:11 2024 +0200
+++ b/src/eric7/VCS/VersionControl.py	Sat Apr 20 18:01:36 2024 +0200
@@ -812,11 +812,11 @@
             if key in dictionary:
                 self.otherData[key] = dictionary[key]
 
-    def vcsResolved(self, name):  # noqa: U100
+    def vcsResolved(self, _name):
         """
         Public method used to resolve conflicts of a file/directory.
 
-        @param name file/directory name to be resolved
+        @param _name file/directory name to be resolved (unused)
         @type str
         """
         # default implementation just refreshes the status
@@ -1123,9 +1123,9 @@
         Note: This method should be overwritten in subclasses in order to
         support VCS status monitoring.
 
-        @param interval check interval for the monitor thread in seconds
+        @param interval check interval for the monitor thread in seconds (unused)
         @type int
-        @param project reference to the project object
+        @param project reference to the project object (unused)
         @type Project
         @return reference to the monitor thread
         @rtype QThread