Git Issue : Unable to merge Dev branch to master

Question

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?

git pull origin dev --rebase Resolve conflicts and push changes to dev — Rohit Mittal, Feb 14 '22 at 05:48

score 1 · Accepted Answer · answered Feb 15 '22 at 09:13

1

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

answered Feb 15 '22 at 09:13

Joshua Zeltser

Push it to Detached Head / dev branch or master branch? – Rohit Mittal Feb 15 '22 at 09:16
It seems that you have merged master into dev no? – Joshua Zeltser Feb 15 '22 at 09:18
To merge dev into master you need to checkout the master branch and then do git merge dev – Joshua Zeltser Feb 15 '22 at 09:18
git checkout master >> git merge remote/origin/dev >> resolves issues >> commit into master >> Push to master branch Is it right? – Rohit Mittal Feb 15 '22 at 09:20
1

that is correct – Joshua Zeltser Feb 15 '22 at 09:21

1 Answers1