Question

I usually work on my Master branch, and push to Production. I accidentally worked on Production branched and deployed the app. Now my Production has the latest version, Master has older version.

What should I do to update the Master branch files to the same as Production? What commands to issue?

I will be careful and work only on Master branch in future. Thanks.

Answer 1

Make your current branch master and run

git merge production

or

git rebase production

See merge vs rebase for differences.