Rene Pfeuffer 33037385e4 Handle unexpected merge results ...

It is possible that a git work tree is dirty directly after the clone
of a repository, eg. when files are not changed correctly due to bogous
.gitattribute files (though this is just a guess). In these cases a
merge might fail due to these dirty files and not due to merge
conflicts. Without this change such results lead to null pointer
exceptions, because result.getConflicts() is null.

2020-02-27 09:56:25 +01:00

..

src

Handle unexpected merge results

2020-02-27 09:56:25 +01:00

pom.xml

remove enunciate since we are using openapi now

2020-02-24 13:36:34 +01:00