Git production and master is not the same

Question

I usually work on my master’s department and click on Production. I accidentally worked on Production forked and deployed the application. Now my version has the latest version, the Wizard has an older version.

What do I need to do to update the core server files in the same way as Production? What commands to issue?

I will be careful and will only work at the Master branch in the future. Thank.

Answer 1

Make the current branch masterand run

git product merger

or

git rebase production

See merge vs rebase for differences.

Answer 2

, , ( rebase), , .

progit.org , git , , .