diff --git a/src/data/error.json b/src/data/error.json index d3585ff..185b5d0 100644 --- a/src/data/error.json +++ b/src/data/error.json @@ -48,6 +48,12 @@ "description": "CONFLICT (add/add): Merge conflict in path/path/filename. Automatic merge failed; fix conflicts and then commit the result.", "solutions": "You have to manually solve the conflict and then: