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

Fix panic when parsing conflict markers #4399

Merged
merged 2 commits into from
Sep 6, 2024
Merged

Fix panic when parsing conflict markers #4399

merged 2 commits into from
Sep 6, 2024

Conversation

martinvonz
Copy link
Owner

Checklist

If applicable:

  • I have updated CHANGELOG.md
  • I have updated the documentation (README.md, docs/, demos/)
  • I have updated the config schema (cli/src/config-schema.json)
  • I have added tests to cover my changes

@martinvonz martinvonz force-pushed the push-rluvqsqosxxy branch 2 times, most recently from ae60b96 to 8c9454a Compare September 5, 2024 16:19
ilyagr
ilyagr approved these changes Sep 5, 2024
View reviewed changes
Copy link
Collaborator

@ilyagr ilyagr left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great, thank you!

(All of my comments are optional)

CHANGELOG.md Outdated Show resolved Hide resolved
lib/src/conflicts.rs Outdated Show resolved Hide resolved
lib/tests/test_conflicts.rs Show resolved Hide resolved
@martinvonz martinvonz merged commit 3133534 into main Sep 6, 2024
31 checks passed
@martinvonz martinvonz deleted the push-rluvqsqosxxy branch September 6, 2024 05:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ilyagr ilyagr ilyagr approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@martinvonz @ilyagr