[BLUEJ-1173] Git conflict message is incomplete / not helpful
For certain conflicts BlueJ issues a message that is not clear, eg:
Share a project (A), check it out in another location (B)
delete the file in A, commit and push
modify the file in B, commit
in B, update
message: "A conflict was detected when trying to update the following file: (...) [Keep my version] [Use repository version]"
The "use repository version" button should be more clearly labelled as "delete file"
Another example:
Share a project (A), check it out in another location (B)
add file "Abc.java" in A, commit and push
add file "Abc.java" in B, modify it (so it is different to the same-named class in the other project), and commit
in B, update
message: "There are unresolved conflicts with the following files. You will have to delete the files locally to resolve the conflict: Abc.java"
in fact you must delete or rename the local file, and then commit, before updating
Issue metadata
- Issue type: Task
- Priority: Medium
- Fix versions: 4.1.3