Commit 584186fd authored by Ben Boeckel's avatar Ben Boeckel

reject_conflict_paths: add missing docstring

parent 843027ab
Pipeline #138487 failed with stage
...@@ -35,6 +35,11 @@ impl RejectConflictPaths { ...@@ -35,6 +35,11 @@ impl RejectConflictPaths {
} }
} }
/// Require that the base file exist for the check to enforce paths.
///
/// If the base exists, then the conflict path patterns will always fire. However, this misses
/// the case where the base file was deleted and the conflict files left behind. Passing `true`
/// here rejects any path matching the conflict patterns.
pub fn require_base_exist(&mut self, require_base_exist: bool) -> &mut Self { pub fn require_base_exist(&mut self, require_base_exist: bool) -> &mut Self {
self.require_base_exist = require_base_exist; self.require_base_exist = require_base_exist;
self self
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment