mirror of
https://github.com/Stone-Red-Code/dvc.git
synced 2026-11-02 07:18:25 +01:00
* git: implement merge (gitpython, pygit2) * pylint: add pygit2 as C extension * git: s/checkout_paths/checkout_index/ and add pygit implementation * git: support basic checkout/merge conflict strategies in checkout_index * fix relpath issue in pygit merge * git: add stubs for add --update * experiments: drop remaining gitpython specific scm usage