Shulou(Shulou.com)05/31 Report--

This article is to share with you about how to carry out pycharm git merge actual combat, the editor thinks it is very practical, so I share it with you to learn. I hope you can get something after reading this article. Let's take a look at it with the editor.

1. First download the master/dev branch locally, and open the pycharm load.

Here are examples with master/dev branch code differences:

2. As you can see from the following figure, the current code is under the dev branch:

3. Switch to the local master branch:

After checkout, it is:

3. Select merge branches:

Choose to merge local master/dev branches here:

Selected here to merge the local dev branch into the local master

4. After the completion of merge:

5. Merge is complete. Look at the remote branch code and find that the dev branch code has not been merged into the master. (the reason is that when merging branches is selected above, local merging is selected.)

Therefore, you also need to push the local merge to the remote.

Here the code that has just been merged appears on the master branch.

6. Another method of merge:

Merge dev into master as an example:

As you can see from the figure above, there is no dev branch available here. So let's introduce another way to merge dev into the master branch:

The merge above represents merging the dev branch into the master branch.

The above is how to conduct pycharm git merge actual combat, the editor believes that there are some knowledge points that we may see or use in our daily work. I hope you can learn more from this article. For more details, please follow the industry information channel.

Welcome to subscribe "Shulou Technology Information " to get latest news, interesting things and hot topics in the IT industry, and controls the hottest and latest Internet news, technology news and IT industry trends.