-
Notifications
You must be signed in to change notification settings - Fork 53
feat: emit a warning when implicit parent conflict found #232
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.
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
Conversation
letFunny
commented
Jul 15, 2025
- Have you signed the CLA?
|
| if err != nil { | ||
| return err | ||
| } | ||
| // Content created was not listed in a slice contents because extractInfo |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
[Comment for reviewer]: This was an optimization which was only skipping some variable assignment and an empty for loop. It is simpler if we remove it and continue processing the path normally rather than adding the logic for finding implicit conflicts twice.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ack.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looking good. Only minors:
| if err != nil { | ||
| return err | ||
| } | ||
| // Content created was not listed in a slice contents because extractInfo |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ack.
internal/slicer/slicer.go
Outdated
| if mode, ok := createdNotListed[relPath]; ok && mode != o.Mode { | ||
| implicitConflicts = append(implicitConflicts, relPath) | ||
| } | ||
| createdNotListed[relPath] = o.Mode |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Isn't inSliceContents and createdNotListed opposites of each other? If so, let's please unify terminology.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I have changed inSliceContents to listed which I think is also much simpler and enough given the context of the function and the terminology. It also matches the rest of the comments were we generally use "listed".
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This was the correct one apparently? That literally says "in slice contents", right? The "contents" field under the "slices" key?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sure, we can use that one, I just thought the other one will be too long: notInSliceContents.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please see replies to your comments.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just a trivial and LGTM, thanks for the work on this.