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

Git: no warning of merge conflict when updating package layout

    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

      No warning is given if updating results in a merge conflict in the package layout file (package.bluej).

      Eg:

      1. Checkout the same repository twice (as A and B)
      2. A: modify package layout, commit and push
      3. B: modify package layout, commit and update
      4. There should be a warning at this point, but there is not.

      The resulting conflict needs a commit to resolve.

       

        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: