github sync errors

"There are both local and remote commits. Please commit all your changes and then sync again."

I tried "pull origin master", then commit everything again in Github. "Sync" finally worked.

R.histry conflicts might partially caused this problem.