fixer: Address rename conflicts with explanation #1120
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
charlieegan3
force-pushed
the
fix-conflicts
branch
2 times, most recently
from
57a9aa7 to
cf527d5
Compare
anderseknert
force-pushed
the
fix-conflicts
branch
from
305c454 to
e68f69d
Compare
anderseknert
approved these changes
Sep 19, 2024
| return fmt.Errorf("failed to create reporter for format %s: %w", params.format, err) | ||
| } | ||
|
|
||
| r.SetDryRun(params.dryRun) |
There was a problem hiding this comment.
Should this not be set any more?
e2e/cli_test.go
Outdated
|
|
||
| import rego.v1 | ||
| `, | ||
| // these thre files should all be at bar/bar.rego, but they cannot all be moved there |
| @@ -11,6 +11,15 @@ import ( | |||
| "github.com/styrainc/regal/pkg/rules" | |||
| ) | |||
|
|
|||
| type RenameConflictError struct { | |||
There was a problem hiding this comment.
Nice! We should do more of this.
Fixes StyraInc#1119 Signed-off-by: Charlie Egan <charlie@styra.com>
Now conflicts are reported by type. If they conflict with an existing file, these are shown first. Then, conflicts created by more than one file being moved to the same location are shown after that - if any. Signed-off-by: Charlie Egan <charlie@styra.com>
Signed-off-by: Charlie Egan <charlie@styra.com>
charlieegan3
force-pushed
the
fix-conflicts
branch
from
e68f69d to
c4f122c
Compare
srenatus
pushed a commit
to srenatus/regal
that referenced
this pull request
Oct 1, 2024
* fixer: Address rename conflicts with explanation Fixes StyraInc#1119 Signed-off-by: Charlie Egan <charlie@styra.com> * fixer: Output the source of conflicts in report Now conflicts are reported by type. If they conflict with an existing file, these are shown first. Then, conflicts created by more than one file being moved to the same location are shown after that - if any. Signed-off-by: Charlie Egan <charlie@styra.com> * fix: Address PR comments Signed-off-by: Charlie Egan <charlie@styra.com> --------- Signed-off-by: Charlie Egan <charlie@styra.com>
charlieegan3
added a commit
to charlieegan3/regal
that referenced
this pull request
Jan 6, 2025
* fixer: Address rename conflicts with explanation Fixes StyraInc#1119 Signed-off-by: Charlie Egan <charlie@styra.com> * fixer: Output the source of conflicts in report Now conflicts are reported by type. If they conflict with an existing file, these are shown first. Then, conflicts created by more than one file being moved to the same location are shown after that - if any. Signed-off-by: Charlie Egan <charlie@styra.com> * fix: Address PR comments Signed-off-by: Charlie Egan <charlie@styra.com> --------- Signed-off-by: Charlie Egan <charlie@styra.com>
# for free
to join this conversation on GitHub.
Already have an account?
# to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #1119