your branch is behind by 2 commits
git pull --rebase
I guess this will solve the problem.
Since you are the only one working on the branch, you can overwrite the state of the remote branch by doing git push --force
.
Though are you sure that you are the only one that is on the branch? If you were the only one working on the branch, only your commits would have been on the remote and you would have had no need to do a git pull
.
Doing git push --force
with a shared branch will cause much more trouble for your team. So make sure that you want to remove the 2 commits that are on the remote branch by doing the following:
git checkout origin/feature/218
git log -3
This will show that last three commits (the 2 you are behind and the last one you share) on the remote make sure that they are yours and that you want the last 2 to be overwritten.