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

Minor javadoc clarification for ConflictType.UNEXPECTED_HASH #7333

Merged
merged 1 commit into from
Aug 4, 2023
Merged

Minor javadoc clarification for ConflictType.UNEXPECTED_HASH #7333

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion api/model/src/main/java/org/projectnessie/model/Conflict.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ enum ConflictType {
/** A namespace must be empty before it can be deleted. */
NAMESPACE_NOT_EMPTY,

/** Reference is not at the expected hash. */
/** Reference is not at the expected hash, reported for reference assignment and deletion. */
UNEXPECTED_HASH,

/** Generic key conflict, reported for merges and transplants. */
Expand Down