Fix Height for Resolve Conflicts Dialog #7815
Open
+2
−2
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
claucambra
requested changes
Feb 3, 2025
alexknop
force-pushed
the
conflictdialogfix
branch
2 times, most recently
from
3a082e0 to
328338c
Compare
|
@claucambra Done. Thank you |
Signed-off-by: knopalex <[email protected]>
alexknop
force-pushed
the
conflictdialogfix
branch
from
328338c to
765d950
Compare
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.
Problem:
-With multiple conflicts to fix, sometimes the dialog box would expand beyond the screen in height and could not be resized to a smaller height.
Solution:
-Adjusted height based on content
-Set more reasonable minimum height
Fixes #7785 #6228