(self)
| 64 | |
| 65 | class CmdMergeDriver(CmdHookBase): |
| 66 | def _run(self): |
| 67 | from dvc.dvcfile import load_file |
| 68 | from dvc.repo import Repo |
| 69 | |
| 70 | dvc = Repo() |
| 71 | |
| 72 | try: |
| 73 | ancestor = load_file(dvc, self.args.ancestor, verify=False) |
| 74 | our = load_file(dvc, self.args.our, verify=False) |
| 75 | their = load_file(dvc, self.args.their, verify=False) |
| 76 | |
| 77 | our.merge(ancestor, their, allowed=["add", "remove", "change"]) |
| 78 | |
| 79 | return 0 |
| 80 | finally: |
| 81 | dvc.close() |
| 82 | |
| 83 | |
| 84 | def add_parser(subparsers, parent_parser): |