fix: split layout of conflict view #3951
Merged
Conversation
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
mejo-
reviewed
Mar 16, 2023
mejo-
requested changes
Mar 16, 2023
max-nextcloud
force-pushed
the
fix/conflict-layout
branch
from
15068eb to
8f4a37b
Compare
mejo-
approved these changes
Mar 16, 2023
Collaborator
Author
|
/backport to stable26 |
Collaborator
Author
|
/compile |
1 flaky tests on run #9086 ↗︎
Details:
|
|||||||||||||||||||||
| Test | Artifacts | |
|---|---|---|
| Open test.md in viewer > Share a file with download disabled shows an error |
Output
Screenshots
|
|
This comment has been generated by cypress-bot as a result of this project's GitHub integration settings.
Give both versions 50% of the screen space and try to vertically align them. This should make comparing the versions easier. Fixes #3950. Signed-off-by: Max <[email protected]>
Signed-off-by: Max <[email protected]>
mejo-
force-pushed
the
fix/conflict-layout
branch
from
6ef4c43 to
21d48ec
Compare
Member
|
/compile |
Signed-off-by: nextcloud-command <[email protected]>
|
The backport to stable26 failed. Please do this backport manually. # Switch to the target branch and update it
git checkout stable26
git pull origin/stable26
# Create the new backport branch
git checkout -b fix/foo-stable26
# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123
# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable26More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport |
Member
|
/backport e83f2db,21d48ec36dd49c63aaa7185e443b9d3043cffe60 to stable26 |
1 task
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.
📝 Summary
Give both versions 50% of the screen space and try to vertically align them. This should make comparing the versions easier.
Fixes #3950.
🖼️ Screenshots
🏁 Checklist
npm run lint/npm run stylelint/composer run cs:check)