nautobot / nautobot-app-version-control

Version Control App that uses and requires a Dolt Database
Other
29 stars 6 forks source link

Revert currently doesn't handle conflicts #179

Open chris-navarro opened 2 years ago

chris-navarro commented 2 years ago

Hi, having an issue on the version control demo environment in "reverting merge changes" getting an error message: Error reverting commits "merged "test_branch" into "main"..total number of changes: 1":(1105, 'revert currently doesn't handle conflicts')

nautobot version : 3.1.14 \ dolt version: 0.39.5

image

note: tried accessing the nautobot DEMO sandbox for VC -App but seems also broken.