[BLUEJ-1174] Git: no warning of merge conflict when updating package layout
No warning is given if updating results in a merge conflict in the package layout file (package.bluej).
Eg:
Checkout the same repository twice (as A and B)
A: modify package layout, commit and push
B: modify package layout, commit and update
There should be a warning at this point, but there is not.
The resulting conflict needs a commit to resolve.
Issue metadata
- Issue type: Task
- Priority: Medium
- Fix versions: 4.1.3