nextcloud / nextcloud/desktop

Resolving the file conflict may result in the loss of the current file version

Open
#10,684 0 comments 0 reactions 0 assignees View on GitHub
0. Needs triage bug
Dominant language
C++
Stars
3.9k
Forks
1k
Avg merge
1d 17h
Merged PRs (30d)
123

Description

### ⚠️ Before submitting, please verify the following: ⚠️

- [x] This is a **bug**, not a question or a configuration issue.
- [x] This issue is **not** already reported on Github (I have searched for it).
- [x] Nextcloud Server and Desktop Client are **up to date**. See [Server Maintenance and Release Schedule](https://github.com/nextcloud/server/wiki/Maintenance-and-Release-Schedule) and [Desktop Releases](https://nextcloud.com/install/#install-clients) for supported versions.
- [x] I agree to follow Nextcloud's [Code of Conduct](https://nextcloud.com/contribute/code-of-conduct/)

### Bug description

If you resolve a file conflict (because the file has been modified differently on the client and on the server) while synchronization is paused and you have modified the file again, the Nextcloud client will not use the current version, but rather the version of the file that existed before synchronization was paused.

### Steps to reproduce

1. Create a synchronization conflict with the server
2. Pause synchronization
3. Continue editing the file
4. Click “Resolve Conflict” and “Use Local File”
5. Synchronize
6. The edits from step 3 are lost

### Expected behavior

If you resolve the conflict using the local file, the local file should be re-read.

### Which files are affected by this bug

the file thas has caused the synchronisation conflict and was edited again.

### Operating system

Linux

### Which version of the operating system you are running.

Linux Mint 22.3

### Installation method

Distro package manager (please test with the AppImage package ?)

### Nextcloud Server version

32.0.3

### Nextcloud Desktop Client version

3.11.0git

### Did this occur after an update or on a clean installation?

Minor version update (i.e. 33.0.0 → 33.0.1)

### Are you using the Nextcloud Server Encryption module?

Yes

### Are you using an external user-backend?

- [x] Default internal user-backend
- [ ] LDAP or Active Directory
- [ ] SSO - SAML
- [ ] Other

### Nextcloud Server logs

```shell

```

### Additional info

_No response_

Contributor guide

Open the contributing guide

Research direction

Start by reproducing the conflict-resolution flow described in the six steps, using the Nextcloud Desktop Client on Linux. Trace the “Resolve Conflict” and “Use Local File” path for the affected file, then verify that edits made while synchronization was paused are preserved after synchronization resumes.

Written by the indexing model from the issue text.

Assessment

Tech stack
cpp
Domain
desktop
Issue type
Bug
Difficulty
3/5
Estimated time
1-2 days
Activity status
Active
Clarity
Mostly clear
Newbie friendliness
52/100

Get new issues in your inbox

A short digest of beginner-friendly GitHub issues.