title: Rebasing with conflict in git
body: <p>[Please I need help, I have been battling with rebasing conflict, the problem is after doing a git rebase origin/master, the rebase gave me an error which I resolved the conflict manually on my code editor by accepting incoming changes, I did a git rebase --continue, git commit --amend ], it showed me a vim editor which I resolved. Then type git push origin master and its giving me an error. What could be the problem here <a href="https://i.stack.imgur.com/Yx9EU.png" rel="nofollow noreferrer">1</a></p>
  <p><a href="https://i.stack.imgur.com/Yx9EU.png" rel="nofollow noreferrer">1</a>: <a href="https://i.stack.imgur.com/Yx9EU.png" rel="nofollow noreferrer">enter image description here</a></p>