W
W
WebDev2020-07-08 17:45:50
git
WebDev, 2020-07-08 17:45:50

How to merge changes from one branch to another?

There is a branch master and maidens. In the maiden I am developing, testing, and now it's time to upload everything to the master. I always just go to phpStorm in the master branch, select the dev branch and click "merge to current". Then he pushed.
I understand that this action cannot be rolled back and it is correct to make a pull request? The fact is that after my actions with draining the dev into the master and pushing, I do not see these changes in BitBucket.
Am I speaking correctly?

Answer the question

In order to leave comments, you need to log in

1 answer(s)
I
Ivan Shumov, 2020-07-08
@inoise

It is correct to do a pull request and also do a squash. In some cases, it is necessary to delete the branch at the final merge, and in some it is not. End of story

Didn't find what you were looking for?

Ask your question

Ask a Question

731 491 924 answers to any question