java+分支合并主线_git合并分支

最新推荐文章于 2023-03-23 16:01:02 发布

葱葱葱葱葱

最新推荐文章于 2023-03-23 16:01:02 发布

阅读量353

点赞数

文章标签： java+分支合并主线

本文链接：https://blog.csdn.net/weixin_32973973/article/details/114924872

版权

假如想将dev_1.0.5_yedp_bgxUserInfo分支合并到test分支上

1、先查看是否在test分支上

$ git status

On branch test

Your branch is up to date with 'origin/test'.

nothing to commit, working tree clean

2、合并分支dev_1.0.5_yedp_bgxUserInfo到test分支上

$ git merge dev_1.0.5_yedp_bgxUserInfo

Updating 070fcdd..c409471

Fast-forward

.../com/wlqq/etc/channel/gx/util/BeanUtils.java | 27 ++

.../etc/channel/gx/ext/GxUserInfoServiceExt.java | 11 +

.../gx/ext/impl/GxUserInfoServiceExtImpl.java | 128 +++++++++

.../channel/gx/ext/vo/res/UserInfoListResVo.java | 285 +++++++++++++++++++++

.../etc/channel/gx/ext/vo/res/UserInfoResVo.java | 263 +++++++++++++++++++

.../etc/channel/gx/service/GxUserInfoService.java | 15 ++

.../gx/service/impl/GxUserInfoServiceImpl.java | 30 +++

.../gx/web/controller/GxUserInfoController.java | 87 +++++++

8 files changed, 846 insertions(+)

create mode 100644 etc-channel-gx-ext/src/main/java/com/wlqq/etc/channel/gx/ext/GxUserInfoServiceExt.java

create mode 100644 etc-channel-gx-ext/src/main/java/com/wlqq/etc/channel/gx/ext/impl/GxUserInfoServiceExtImpl.java

create mode 100644 etc-channel-gx-ext/src/main/java/com/wlqq/etc/channel/gx/ext/vo/res/UserInfoListResVo.java

create mode 100644 etc-channel-gx-ext/src/main/java/com/wlqq/etc/channel/gx/ext/vo/res/UserInfoResVo.java

create mode 100644 etc-channel-gx-service/src/main/java/com/wlqq/etc/channel/gx/service/GxUserInfoService.java

create mode 100644 etc-channel-gx-service/src/main/java/com/wlqq/etc/channel/gx/service/impl/GxUserInfoServiceImpl.java

create mode 100644 etc-channel-gx-web/src/main/java/com/wlqq/etc/channel/gx/web/controller/GxUserInfoController.java

另：如果合并分支是远端的前面加上origin/

git merge origin/dev_1.4.2_dingj_qlFafei

3、提交分支

$ git push

Everything up-to-date

关注