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.

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

Bugfix/conflict resolution when selecting folder #4914

Merged
merged 2 commits into from
Sep 10, 2022

Conversation

allexzander
Copy link
Contributor

Fix #4904

@codecov
Copy link

codecov bot commented Sep 9, 2022

Codecov Report

Merging #4914 (1145e59) into master (a6867f9) will increase coverage by 0.01%.
The diff coverage is 100.00%.

❗ Current head 1145e59 differs from pull request most recent head 2a529ee. Consider uploading reports for the commit 2a529ee to get more accurate results

@@            Coverage Diff             @@
##           master    #4914      +/-   ##
==========================================
+ Coverage   57.16%   57.17%   +0.01%     
==========================================
  Files         138      138              
  Lines       17135    17136       +1     
==========================================
+ Hits         9795     9798       +3     
+ Misses       7340     7338       -2     
Impacted Files Coverage Δ
src/common/syncjournaldb.cpp 78.17% <100.00%> (+0.31%) ⬆️
src/libsync/propagatedownload.cpp 64.88% <0.00%> (-0.30%) ⬇️

@allexzander allexzander force-pushed the bugfix/conflict-resolution-when-selecting-folder branch from 1145e59 to a2349d3 Compare September 9, 2022 11:33
@allexzander allexzander requested a review from mgallien September 9, 2022 13:56
…'Finish' button in a Wizard page.

Signed-off-by: alex-z <blackslayer4@gmail.com>
…osed for every folder of the account that has been removed.

Signed-off-by: alex-z <blackslayer4@gmail.com>
@mgallien mgallien force-pushed the bugfix/conflict-resolution-when-selecting-folder branch from a2349d3 to 2a529ee Compare September 10, 2022 08:34
@nextcloud-desktop-bot
Copy link

AppImage file: nextcloud-PR-4914-2a529eef3c317192765822c606f337a2ae0aca8d-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.

@sonarqubecloud
Copy link

SonarCloud Quality Gate failed.    Quality Gate failed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

67.9% 67.9% Coverage
0.0% 0.0% Duplication

@mgallien mgallien merged commit 9803607 into master Sep 10, 2022
@mgallien mgallien deleted the bugfix/conflict-resolution-when-selecting-folder branch September 10, 2022 09:11
@mgallien
Copy link
Collaborator

/backport to stable-3.6

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Bug]: conflict resolution for existing folder when setting up sync connection is broken
3 participants