ANY use of the contents of this repository shall be credited accordingly. Read the license. In case you commit changes after a different person pushed changes -Command Line -git pull (broken) -git stash -git pull (works now) -git stash pop -git push -Source Control -should fix it for you -else ask master Ilir