Craig Oliver Desktop BTT Writer: When I import a project from WACS and there is already a similar project locally, if I've made a change to the WACS project and elect to merge with the local one, I get an error.
Then when I open my project, instead of showing the 2 versions and asking which I want to keep, it shows only something like "\v 1 \v 2 Conflict parsing error" with a button that says "Resolve conflict - Click on the version to keep".
When I select the blue area and click Confirm, the text for that chunk gets overwritten by "Conflict Parsing Error".
Edited[12/2 3:40 PM] Pamela Gamer
Resolving merge conflicts works on Android, but not on Desktop (version 1, build 3).
[11/26 11:10 AM] Pamela Gamer
Craig Oliver Desktop BTT Writer: When I import a project from WACS and there is already a similar project locally, if I've made a change to the WACS project and elect to merge with the local one, I get an error.
Then when I open my project, instead of showing the 2 versions and asking which I want to keep, it shows only something like "\v 1 \v 2 Conflict parsing error" with a button that says "Resolve conflict - Click on the version to keep".
When I select the blue area and click Confirm, the text for that chunk gets overwritten by "Conflict Parsing Error".
Edited[12/2 3:40 PM] Pamela Gamer
Resolving merge conflicts works on Android, but not on Desktop (version 1, build 3).