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

Rename ConflictResolution.IGNORE -> ADD #6686

Merged
merged 1 commit into from
Apr 25, 2023
Merged

Rename ConflictResolution.IGNORE -> ADD #6686

merged 1 commit into from
Apr 25, 2023

Conversation

snazy
Copy link
Member

@snazy snazy commented Apr 25, 2023

No description provided.

@snazy snazy requested a review from dimas-b April 25, 2023 19:24
dimas-b
dimas-b previously approved these changes Apr 25, 2023
View reviewed changes
@snazy snazy requested a review from dimas-b April 25, 2023 19:32
@snazy snazy merged commit e7cebaf into projectnessie:main Apr 25, 2023
@snazy snazy deleted the conf-res-ign branch April 25, 2023 20:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dimas-b dimas-b dimas-b 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
@snazy @dimas-b