I am trying to merge dev branch to master. I am getting below message.

I did

git checkout 84c65de

followed by

git merge remotes/origin/master

I resolved issues in Vs Code. What to do next. Shall I push change to dev/master?

CodePudding user response：

Once the changes are resolved you need to add and commit them. Then the merge will be complete and you can push your code