added a git-related problem solution
Merge branch 'master' of github.com:marouanabbessi/myknowledgesharing