Uploaded image for project: 'BlueJ'
  1. BlueJ
  2. BLUEJ-1173

Git conflict message is incomplete / not helpful

    Details

    • Type: Task
    • Status: Closed
    • Priority: Medium
    • Resolution: Done
    • Affects Version/s: 4.1.2
    • Fix Version/s: 4.1.3
    • Component/s: Teamwork
    • Sprint:
      BlueJ 4.1.3

      Description

      For certain conflicts BlueJ issues a message that is not clear, eg:

      1. Share a project (A), check it out in another location (B)
      2. delete the file in A, commit and push
      3. modify the file in B, commit
      4. in B, update
      5. message: "A conflict was detected when trying to update the following file: (...) [Keep my version] [Use repository version]"
      6. The "use repository version" button should be more clearly labelled as "delete file"

      Another example:

      1. Share a project (A), check it out in another location (B)
      2. add file "Abc.java" in A, commit and push
      3. add file "Abc.java" in B, modify it (so it is different to the same-named class in the other project), and commit
      4. in B, update
      5. message: "There are unresolved conflicts with the following files. You will have to delete the files locally to resolve the conflict: Abc.java"
      6. in fact you must delete or rename the local file, and then commit, before updating

        Attachments

          Activity

            People

            • Assignee:
              davmac Davin McCall
              Reporter:
              davmac Davin McCall
            • Votes:
              0 Vote for this issue
              Watchers:
              1 Start watching this issue

              Dates

              • Created:
                Updated:
                Resolved: