search

planetfederal / qgis-geogiglight-plugin

GNU General Public License v2.0
19 stars 9 forks source link

python error in "merge conflicts" when clicking on "solve with..." #70

Closed gioman closed 8 years ago

gioman commented 8 years ago

the error is always the same, regardless choosing "local", "remote" or "merged".

AttributeError: 'Repository' object has no attribute 'closeConflictSolving' 
Traceback (most recent call last):
  File "C:/Users/qgis/.qgis2/python/plugins\geogig\layeractions.py", line 129, in _syncLayer
    if syncLayer(layer):
  File "C:/Users/qgis/.qgis2/python/plugins\geogig\tools\gpkgsync.py", line 110, in syncLayer
    repo.closeConflictSolving(user, email, "Resolved merge conflicts", conflicts[0].transactionId)
AttributeError: 'Repository' object has no attribute 'closeConflictSolving
gioman commented 8 years ago

Fix confirmed.