Git easier to use than svn?
We are currently using SVN as our version control system for php development but we are thinking about changing to git. SVN seems to break quite often and as a result we get errors like these when trying to commit:
svn: Item 'xyz' is out of date
svn: Working copy 'xyz' locked (svn cleanup doesn't solve this)
svn: Working copy missing

So the functionality we are missing is to tell the version control system that the local version is now fine, just push it to the repository (without endless errors).

Does git have this kind of feature? Is it easier to use?
Git easier to use than svn?
===

We are currently using SVN as our version control system for php development but we are thinking about changing to git. SVN seems to break quite often and as a result we get errors like these when trying to commit:
svn: Item 'xyz' is out of date
svn: Working copy 'xyz' locked (svn cleanup doesn't solve this)
svn: Working copy missing

So the functionality we are missing is to tell the version control system that the local version is now fine, just push it to the repository (without endless errors).

Does git have this kind of feature? Is it easier to use?