MerginMaps / mergin-py-client

77%

master: 78%

LAST BUILD ON BRANCH unfinished-pull-conflicts

branch: unfinished-pull-conflicts

CHANGE BRANCH

x

Reset

• unfinished-pull-conflicts
• 0.5.12
• 0.6.0
• 0.6.1
• 0.6.2
• 0.6.3
• 0.6.4
• 0.6.5
• 0.6.6
• 0.7.0
• 0.7.1
• 0.7.2
• 0.7.3
• 0.7.4
• api_calls_for_history_and_diffs
• ci-fix
• cli-commands
• cli_easier_login
• clone_project
• comparing_project_ids
• conflict_unique_names
• debug-segfault
• disable_rename
• expired_tokens
• failing_rabase_tests
• fix-104-105
• fix-107
• fix-139-140
• fix-172
• fix-180
• fix-190
• fix-coveralls-tests
• fix-download
• fix-permissions-retrieval
• fix-report
• fix-tests-project-delete
• fix_list
• fix_non_latest_ver_download
• fix_proj_sync_on_win
• fix_storage_limit_65
• free-space-check
• gh-action-tests
• handle-exceptions
• handle-rebase-failure
• handling_non_existing_files
• infra
• log-exceptions
• master
• more-examples
• namespace_for_new_project
• no_connection_error_msg
• only_public
• preserve-log
• project-conflict-name
• project-info-by-id
• project-metadata-api
• project-metadata-rework
• project_collaborators_modify
• project_id_in_metadata
• python_warnings
• rebase-tests
• refactor_apply_pull_changes
• report-latest-version
• report_tool
• robustness-fixes
• skip-tables
• support_for_http_proxy
• sync_cancelling
• test_for_locally_missing_files
• update-url
• user-service-api
• wait-before-cleanup
• workspaces

return list of conflict files when resolving unfinished pull