Here is the full error message Commit failed - exit code 1 received, with output: 'error: path 'databaseProject/Services/WorkoutService.swift' does not have our version'
I was trying to merge into origin, but after resolving all conflicts I was presented with this error, and cannot find any information on it.
even though Mike 'Pomax' Kamermans should most likely be the reason anyway I'd like to add:
More reasons can already be found in "Commit failed - exit code 1 received" when trying to commit a new local reprository in gihub desktop (might even be a duplicate anyway).
In case you actually need nested Git repositories, you could use Git Submodules.
Cheers,
Dominic
