renku mergetool

Custom git merge tool for renku metadata.

Description

Renku stores all of its metadata in the repository, in compressed form. When working in multiple branches with Renku, this metadata needs to be merged when a git merge is made. To support users when doing this, Renku provides a custom merge tool that takes care of merging the metadata.

The merge tool is set up automatically when creating a new project or when using renku clone to clone a Renku project. Keep in mind the merge tool configuration cannot be shared through remote repositories and has to be set up on each clone separately.

You can manually set up the merge tool by running renku mergetool install.

Commands and options

renku mergetool

Mergetool commands.

renku mergetool [OPTIONS] COMMAND [ARGS]...

install

Setup mergetool locally.

renku mergetool install [OPTIONS]