Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert currently doesn't handle conflicts #179

Open
chris-navarro opened this issue May 6, 2022 · 0 comments
Open

Revert currently doesn't handle conflicts #179

chris-navarro opened this issue May 6, 2022 · 0 comments
Labels
bug Something isn't working

Comments

@chris-navarro
Copy link

chris-navarro commented May 6, 2022 •
edited
Loading

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.
@glennmatthews glennmatthews added the bug Something isn't working label Jul 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
bug Something isn't working
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@glennmatthews @chris-navarro