Skip to content
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.

Sign up for GitHub

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

Jump to bottom

[stable-3.12] Bugfix/folder conflict disappear #6665

Merged
merged 1 commit into from
Apr 23, 2024
Merged

[stable-3.12] Bugfix/folder conflict disappear #6665

merged 1 commit into from
Apr 23, 2024

Conversation

allexzander
Copy link
Contributor

@allexzander allexzander commented Apr 23, 2024 •
edited
Loading

Backport of PR #6655

@allexzander
Bugfix/folder conflict disappear
49c6c3e 
Signed-off-by: alex-z <blackslayer4@gmail.com>
@nextcloud-desktop-bot
Copy link

AppImage file: nextcloud-PR-6665-49c6c3e36c7a4d5fba86f2e92cf4aae948bbfff4-x86_64.AppImage

To test this change/fix you can simply download above AppImage file and test it.

Please make sure to quit your existing Nextcloud app and backup your data.

@sonarcloud SonarCloud
Copy link

sonarcloud bot commented Apr 23, 2024

Quality Gate Failed Quality Gate failed

Failed conditions
72.2% Coverage on New Code (required ≥ 80%)
2 New Code Smells (required ≤ 0)

See analysis details on SonarCloud

Catch issues before they fail your Quality Gate with our IDE extension SonarLint

@allexzander allexzander changed the title Bugfix/folder conflict disappear [stable-3.13] Bugfix/folder conflict disappear Apr 23, 2024
@allexzander allexzander changed the title [stable-3.13] Bugfix/folder conflict disappear [stable-3.12] Bugfix/folder conflict disappear Apr 23, 2024
@mgallien mgallien merged commit 846df3a into stable-3.12 Apr 23, 2024
9 of 13 checks passed
@mgallien mgallien deleted the backport/6655/stable-3.12 branch April 23, 2024 12:48
@mgallien mgallien added this to the 3.12.4 milestone Apr 23, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mgallien mgallien mgallien approved these changes

@claucambra claucambra Awaiting requested review from claucambra

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
3.12.4
Development

Successfully merging this pull request may close these issues.
3 participants
@allexzander @nextcloud-desktop-bot @mgallien