mirror of
https://github.com/scm-manager/scm-manager.git
synced 2026-01-17 13:02:14 +01:00
33037385e4
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.
Plugins moved see https://bitbucket.org/sdorra/scm-manager/wiki/scm-plugins for details.