Dupliquei commits pelo fato do primeiro não ter dado certo e a partir daí desandou meus commits (invalidei meu repositório tentando reverter), como eu consigo lidar com os seguintes erros?
hint: Updates were rejected because the remote contains work that you do
hint: not have locally. This is usually caused by another repository pushing
hint: to the same ref. You may want to first integrate the remote changes
hint: (e.g., 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.Se tento fazer um pull, ocorre um conflito e me impede de dar push:
* branch master -> FETCH_HEAD
2cf3894..861605f master -> heroku/master
Auto-merging target/m2e-wtp/web-resources/META-INF/maven/org.casadocodigo/casadocodigo/pom.properties
CONFLICT (content): Merge conflict in target/m2e-wtp/web-resources/META-INF/maven/org.casadocodigo/casadocodigo/pom.properties
Automatic merge failed; fix conflicts and then commit the result.