[QA] conflict state is not resolved by removing the conflict file

[jnweiger]

Pre-submission Checks

• I checked for similar issues, but could not find any. I also checked the closed issues. I could not contribute additional information to any existing issue.
• I will take the time to fill in all the required fields. I know that the bug report may be dismissed otherwise due to lack of information.

Describe the QA issue

Seen with testpilotcloud client 3.2.0.10176 and server 10.12.0-rc.2

• Connect client to server,
• Change a file on the server,
• Quickly also change the same file locally.
• A conflict occurs. OK.
• Messages are show in the 'Not Synced' tab, and a message in the main window indicates the conflict. OK.
  
  

---

• User studies the tow copies locally, and decides to remove the one named "... (conflicted copy ...) ..."
• Wait for next sync run. Nothing happens. The conflict messages remain. BAD.
• User edits the file locally.
• The file is happily uploaded to the server
  

---

• Wait for next sync run. Still nothing happens. The conflict messages remain. BAD.
• User edits the file on the server.
• Wait for next sync run. The file gets downloaded correctly. But still the messages remain in both places.
• Renaming also does not change the messages.

It is unclear, what actions should be done to remove the messages after clearing the conflict.

Steps to reproduce the issue

.

Screenshots

.

Expected behavior

.

Actual behavior

tp10569-log.zip

[fmoc]

Can you try to force the sync and see if the error goes away?

[jnweiger]

Can you try to force the sync and see if the error goes away?

Yes. Same as normal sync. The file is already synced. But the error message remains.

[TheMrAnderson]

I've noticed the same thing for a while now. One of my folders I have synced is my repo folder so I can switch machines and pick up where I left off the other. Most of the time it goes off without a hitch, but here lately it's been saying there are conflicted files within this folder. I'm on Linux on both machines and running the latest client. Just to verify there were no more conflicted files I ran the following command "find . -name "* (conflicted copy*" -type f" and it returned no results after I had resolved all the conflicts. I have removed and re-added the sync folder to get this message to go away.

[Salipa-Gurung]

Tested with ownCloud version 4.0.0.10458-daily20230320
oCIS Server: ocis.ocis-traefik.latest.owncloud.works

Expected: Elimination of conflict error message after clearing conflict

In windows

Conflict error message displayed during conflict	Conflict error message eliminated after clearing conflict ✔️