(self, ancestor, other, allowed=None)
| 212 | self.remove() |
| 213 | |
| 214 | def merge(self, ancestor, other, allowed=None): |
| 215 | assert isinstance(ancestor, SingleStageFile) |
| 216 | assert isinstance(other, SingleStageFile) |
| 217 | |
| 218 | stage = self.stage |
| 219 | stage.merge(ancestor.stage, other.stage, allowed=allowed) |
| 220 | self.dump(stage) |
| 221 | |
| 222 | |
| 223 | class ProjectFile(FileMixin): |