git - Can't push to Github repo -

git - Can't push to Github repo -

been using git while created github account. i've setup repo maintain getting errors when seek force it.

error: failed force refs 'https://github.com/username/myrepo.git' hint: updates rejected because remote contains work do hint: not have locally. caused repository pushing hint: same ref. may want first integrate remote changes hint: (e.g., 'git pull ...') before pushing again. hint: see 'note fast-forwards' in 'git force --help' details.

i've tried doinggit pull pull not possible because have unmerged files.

any ideas?

check diff between stuff , remote repository http://git-scm.com/docs/git-diff , merge files want merged, or if don't have need in local can git checkout . remove changes , git pull pull remote repository is.

git github