Conflict resolution fails

[mtCarto]

Attempting to resolve a conflict fails using the resolve all conflicts with or selecting via the attribute table in the conflict window. I am using the bikepdx data from the GeoGig workshop.

Attribute conflict: Make an attribute change on branch1, switch to branch2 and make a different change on the same attribute. Switch to master, merge both branches.

Resolving all conflicts with to merge or local Error dialog pops up: Could not complete geogig command "Nothing to commit after ######", closing the dialog box we are left in the middle of the merge. Clicking resolve conflicts brings up an empty conflict dialog. All you can do is abort the merge.

Resolving conflict by choosing attributes from table
Click solve Error is thrown: "Wrong attribute definition COMMENTS" , and nothing happens. In both branches the COMMENTS attribute is empty.

Workaround: Use the command line to resolve conflict

Geometry conflict: Make geometry change on a feature on branch1, switch to branch2 and make a different change on same feature. Attempt to merge both branches with master

Same error, problems, and workaround as above

[alexbruy]

Confirmed. Maybe this caused by changes in GeoGig API which are not reflected in geogig-py and plugin