-
Notifications
You must be signed in to change notification settings - Fork 725
Fixes #2022. ScrollBarView doesn't show the down arrow on vertical if there isn't horizontal. #2023
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
… be cleared or not.
…cal if there isn't horizontal.
|
@BDisp I'm afraid my latest merges caused a conflict here. Can you resolve? |
Did you made this change? I'm getting an error: |
I don't think I did. I am super confused myself! |
|
In my commit e8ef793 I only reformat that. But you did a revert and now the develop branch is different: |
|
Here it is a8b7f94 |
|
How did I do that? Arrg. So sorry. Can you easily tell what the correct way to fix this is? |
I think the better accurate way is doing a reset keeping the changes. Then you create a new PR with the title equal to the original. I think doing a revert on a reverted commit all the changes are lost. So do a reset keeping the changes. |
|
If you already other commits after the reverted commit the reset isn't a good solution, because it will undo all the commits above. I'm googling about the better way :-) |
|
I have no idea where the I've gone back and looked at the Is this the only line that is screwed up? |
e8ef793 to
583a8fb
Compare
No, this PR was rebase from a wrong develop branch and that why this it having errors. |
|
@BDisp Would it be possible for you to recover the changes you meant for this PR from your local repo, create a new branch, and push a new PR? |
I'll try to found some original branch which I can recover with the latest changes. |
3669b65 to
dfcccff
Compare
|
I already did with the latest branch which was already merged in PR #2020 and I still get this conflicts. I also doesn't seen in the develop branch the "ReflectionTools.cs" file which was merged with the PR #2000. |
I already tried create a new branch to push a new PR, but result in one unchanged branch because indeed this changes were already merged no the PR #2020 to avoid unit test failure with the |
|
Here is a print screen of all files that were changed with news PR's after the PR #2020 was merged: |
|
I think I discovery the culprit of the I think the better option to solve this is doing a git reset with keep changes option and stage all that is right and submit a new PR again. When all is well verified you can discard the wrongs changes. |
|
Bummer. I won't be able to work on this until Sunday at the earliest! |





Fixes #2022 - The
contentBottomRightCornerwas always drawing over the down arrow.Pull Request checklist:
CTRL-K-Dto automatically reformat your files before committing.dotnet testbefore commit///style comments)