-
Notifications
You must be signed in to change notification settings - Fork 35
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fixer: Address rename conflicts with explanation (#1120)
* fixer: Address rename conflicts with explanation Fixes #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>
- Loading branch information
1 parent
838c6fa
commit a23bb63
Showing
8 changed files
with
405 additions
and
73 deletions.
There are no files selected for viewing
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
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
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
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
Oops, something went wrong.