FIX: conflict actions bar overlapping Complete Merge button fixed#184603
Merged
hediet merged 1 commit intomicrosoft:mainfrom Jun 9, 2023
Merged
FIX: conflict actions bar overlapping Complete Merge button fixed#184603hediet merged 1 commit intomicrosoft:mainfrom
hediet merged 1 commit intomicrosoft:mainfrom
Conversation
dbaeumer
approved these changes
Jun 9, 2023
This file contains hidden or 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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
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.
This PR Fixes #184567
The issue was in the Merge Editor on the Result tab. If the conflict actions bar intersects with the Complete Merge button and if any action is selected in the conflict actions bar, the conflict actions bar overlaps the Complete Merge button within the z-index's stacking context, preventing us from clicking the button. For more information, please check out the linked issue.
Now, here is the result after the fix!
Complete.Merge.Issue.Resolved.Screen.Recordnig.webm