没有不值得去解决的问题,也没有不值得去学习的技术!

How to Merge Commits From the wx-auth Branch Into develop Using TortoiseGit

Perform the merge from the remotes/origin/wx-auth branch (the reason for not selecting the wx-auth branch is that the code in the local repository's wx-auth branch is not up to date)

1. View the commits on the develop branch in GitLab, as shown in Figure 1.

View the commits on the develop branch in GitLab
Figure 1

2. View the commits on the wx-auth branch in GitLab, as shown in Figure 2.

View the commits on the wx-auth branch in GitLab
Figure 2

3. In the local repository, switch to the develop branch, right-click, and select TortoiseGit -> Merge, as shown in Figure 3.

In the local repository, switch to the develop branch, right-click, and select TortoiseGit -> Merge
Figure 3

4. Perform the merge from the remotes/origin/wx-auth branch (the reason for not selecting the wx-auth branch is that the code in the local repository’s wx-auth branch is not up to date). The merge is completed, as shown in Figures 4 and 5.

Perform the merge from the remotes/origin/wx-auth branch (the reason for not selecting the wx-auth branch is that the code in the local repository's wx-auth branch is not up to date)
Figure 4
Merge completed
Figure 5

5. Right-click, select TortoiseGit -> Push, and the push succeeds, as shown in Figure 6.

Right-click, select TortoiseGit -> Push, and the push succeeds
Figure 6

6. View the commits on the develop branch in GitLab; the commits from the wx-auth branch have been merged into the develop branch, as shown in Figure 7.

View the commits on the develop branch in GitLab; the commits from the wx-auth branch have been merged into the develop branch
Figure 7

7. View the commits on the wx-auth branch in GitLab; there is no change (the commits on the develop branch were not merged into the wx-auth branch), which is as expected, as shown in Figure 8.

View the commits on the wx-auth branch in GitLab; there is no change (the commits on the develop branch were not merged into the wx-auth branch), which is as expected
Figure 8

关于作者 · 持续学习与技术实践

我是一名拥有 15 年以上开发经验的技术从业者,自 2013 年起持续运营个人技术博客,记录工作与个人项目中遇到的真实问题,以及解决问题过程中的探索、实践和思考。

除了技术写作,我也在持续开发和维护自己的独立项目,探索新技术和新工具在实际场景中的应用。我始终相信,没有不值得去解决的问题,也没有不值得去学习的技术。

如果这篇文章对你有所帮助,欢迎浏览博客中的其他文章,也欢迎交流技术经验与想法。

关于我  ·  GitHub  ·  邮件联系