2022-03-09 22:19:22 +08:00
@ REM
2024-02-29 21:35:12 +08:00
@ REM Copyright (c) 2019 Of Him Code Technology Studio
2024-02-29 14:10:24 +08:00
@ REM Jpom is licensed under Mulan PSL v2.
@ REM You can use this software according to the terms and conditions of the Mulan PSL v2.
@ REM You may obtain a copy of Mulan PSL v2 at:
@ REM http://license.coscl.org.cn/MulanPSL2
@ REM THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
@ REM See the Mulan PSL v2 for more details.
2022-03-09 22:19:22 +08:00
@ REM
2021-07-21 19:27:15 +08:00
@ REM Jpom Multi-branch, multi-remote merge code commands
2019-03-13 17:59:04 +08:00
2019-02-21 13:54:25 +08:00
@ echo off
cd ../
2021-07-21 19:27:15 +08:00
echo Pull remote branch [master]
2019-02-27 21:11:06 +08:00
call git checkout dev
2019-02-21 13:54:25 +08:00
call git fetch github master:master
call git fetch gitee master:master
2021-07-21 19:27:15 +08:00
echo Pull remote branch [dev]
2019-02-21 13:54:25 +08:00
call git checkout master
2019-02-27 21:11:06 +08:00
call git fetch github dev:dev
call git fetch gitee dev:dev
2021-07-21 19:27:15 +08:00
echo Start merging branches [master]
2019-02-27 21:11:06 +08:00
call git checkout dev
call git merge master
2021-07-21 19:27:15 +08:00
echo Start merging branches [dev]
2019-02-27 21:11:06 +08:00
call git checkout master
2019-02-21 13:54:25 +08:00
call git merge dev
2021-07-21 19:27:15 +08:00
echo Push to gitee
2019-02-27 21:11:06 +08:00
call git push gitee dev
2019-02-21 13:54:25 +08:00
call git push gitee master
2021-07-21 19:27:15 +08:00
echo Push to github
2019-02-21 13:54:25 +08:00
call git push github dev
call git push github master
2021-07-21 19:27:15 +08:00
echo Push tags
2019-02-27 21:11:06 +08:00
call git push github --tags
2019-02-22 18:35:42 +08:00
call git push gitee --tags
2024-02-29 21:35:12 +08:00
call git checkout dev
