feat: simplify ConflictPicker by providing content only + preview resize #919
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
Codecov Report
@@ Coverage Diff @@
## master #919 +/- ##
==========================================
+ Coverage 91.42% 91.54% +0.12%
==========================================
Files 3 3
Lines 70 71 +1
Branches 11 11
==========================================
+ Hits 64 65 +1
Misses 4 4
Partials 2 2
|
skjnldsv
force-pushed
the
fix/fileconflictname
branch
from
5c9eca3
to
13c2057
Compare
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
skjnldsv
force-pushed
the
fix/fileconflictname
branch
from
13c2057
to
a47ad15
Compare
Pytal
reviewed
Aug 31, 2023
Pytal
approved these changes
Aug 31, 2023
skjnldsv
changed the title
…ch optimization Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
skjnldsv
force-pushed
the
fix/fileconflictname
branch
from
11ae6e1
to
84d24ce
Compare
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in 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.
If we only gives the conflicting files, we cannot know of another file will conflict with the new generated name