nautobot-app-version-control icon indicating copy to clipboard operation
nautobot-app-version-control copied to clipboard

Revert currently doesn't handle conflicts

Open chris-navarro opened this issue 3 years ago • 0 comments
trafficstars

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.

chris-navarro avatar May 06 '22 11:05 chris-navarro

As currently implemented, at least in the GMail case, we do not mark emails as Read. I am entirely OK with this behavior. However, we've had a feature request to instead assign a specific tag/label to emails only after they are successfully processed and parsed - would that fall within scope of this issue, or shall I open a separate issue for that feature?

glennmatthews avatar Sep 23 '21 16:09 glennmatthews

Spun that off into #120 as a separate feature request.

glennmatthews avatar Sep 27 '21 20:09 glennmatthews