Error Pushing and Pulling to/from Remote Server

I created a new repo with my wp project on bitbucket. Afterwards, I installed revisr and input my credentials via https. I was then succesfully authenticated and received a message of a few untracked changes. I committed those changes and checked the option to back up the database and push the changes to the remote repo.

Then I get a confirmation that the changes were committed to the local repo but there was an error pushing to remote:

“To https://username:[email protected]/username/repo
! [rejected] HEAD -> master (non-fast-forward)
error: failed to push some refs to ‘https://username:[email protected]/username/repo’
To prevent you from losing history, non-fast-forward updates were rejected
Merge the remote changes (e.g. ‘git pull’) before pushing again. See the
‘Note about fast-forwards’ section of ‘git push –help’ for details.

I also get a pull request and when I click to pull I get this error:

warning: Cannot merge binary files: /…
Auto-merging….
Automatic merge failed; fix conflicts and then commit the result.

How can I fix these conflicts both in push and in pull?

Thanks in advance, I would really appreciate some help to get this set up.

https://www.ads-software.com/plugins/revisr/