CODEWITHSUNDEEP
git
mrjayviper
mrjayviper

Reputation: 2388

put changes on my development branch to master branch

I created a new branch called development branch and made changes to that. The users and myself tested the new code and everything is working fine.

I now want to put all the changes made to our master branch so I can implement it to production.

How do I this step?

Upvotes: 0

Views: 80

Answers (1)

VonC
VonC

Reputation: 1327184

The best practice remains to perform the merge locally on your computer first, before pushhing back to BitBucket remote repo.

git checkout master
# make sure master is up-to-date
git pull

git merge development

You might have to resolve some merge conflict, and test again that everything is still working after the merge.
Then push.

Upvotes: 1

Related Questions