Fortunately I have made yesterday an old fashion backup by copying the project folder to other location. This saved my work and I restored the today changes for an hour.

The reason for the fail was a commit to the master branch from a contributor. This commit was in conflict with my changes.

Please, all contributors use Pull Request or make other branches instead of pushing directly to the master branch on GitHub.