search

koordinates / kart-qgis-plugin

A QGIS integration plugin for Kart repositories. Distributed version-control for geospatial and tabular data.
https://kartproject.org
GNU General Public License v2.0
37 stars 16 forks source link

Conflicting features when merging branches #72

Open ale-tenorio opened 2 years ago

ale-tenorio commented 2 years ago

Describe the bug When trying to merge two branches I get a conflict message but I cannot access the solve conflicts tool.

To Reproduce Steps to reproduce the behaviour:

  1. Create a repo and import two shapefile format datasets.
  2. Create a branch and make an edit on dataset 1.
  3. Switch to main and make an edit on dataset 1.
  4. Merge branch into main.

Expected behaviour Both branches should merge with no problem.

Output Conflict error and I get the following warning when trying to solve conflicts

C:\Program Files\Kart\kart\cli_util.py:356: RemovalInKart012Warning: --json-style is deprecated and will be removed in Kart 0.12. use --output-format=geojson:extracompact instead Usage: kart.exe conflicts [OPTIONS] [FILTERS]... Error: Invalid value for --output: Need to specify a directory via --output for GeoJSON with more than one dataset

Version Info Kart Plugin version 1.0.2 QGIS version 3.20.3-Odense Operating system Windows 10 10.0.19041 Kart version Kart v0.11.3, Copyright (c) Kart Contributors » GDAL v3.3.2; PROJ v8.1.1 » PyGit2 v1.9.0; Libgit2 v1.4.2; Git v2.34.0.windows.1.13.g93318cbc8d » SQLAlchemy v1.4.36; pysqlite3 v2.6.0/v3.31.1; SpatiaLite v5.0.0; Libpq v11.0.9 » SpatialIndex v1.9.3