Marks this conflict as resolved with optional notes.
(&mut self, resolution: Option<String>)
| 356 | |
| 357 | /// Marks this conflict as resolved with optional notes. |
| 358 | pub fn mark_resolved(&mut self, resolution: Option<String>) { |
| 359 | self.resolved = true; |
| 360 | self.resolution = resolution; |
| 361 | } |
| 362 | |
| 363 | /// Marks this conflict as unresolved. |
| 364 | pub fn mark_unresolved(&mut self) { |
no outgoing calls