git-dev分支merge到master
1、首先idea本地代码:checkout 到master,如下图所示:
(2)、如下图所示:
1、点击idea下面边框上的Terminal,进入到命令行
2、查看当前分支状态:git status ,当前状态为:
On branch master
Your branch is up-to-date with 'origin/master'.
nothing to commit, working directory clean
表示为'origin/master'可以进行合并
3、输入要合并的命令:git merge dev 表示:将dev修改过的代码合并到master
D:\IdeaProjects\eam-service>git merge dev
Merge made by the 'recursive' strategy.
src/main/java/cn/crp/eam/controller/UserTodoListController.java | 3 ++-
src/main/java/cn/crp/eam/controller/WorkTicketController.java | 3 +++
.../crp/eam/controller/firepower/FirepowerWorkTicketController.java | 6 +++---
src/main/java/cn/crp/eam/service/LightAppService.java | 4 ++--
4 files changed, 10 insertions(+), 6 deletions(-)
表示合并成功,然后 在master进行,代码push推送 就OK了