"src/main/git@git.cardiff.ac.uk:d1634883/client-project.git" did not exist on "5458b022fe6741ab8852de87ee669a623e3611a2"
Update new files
Compare changes
Conflict: This file was modified in both the source and target branches.
Ask someone with write access to resolve it.
+ 2
− 1