软件研发 --- 代码合并方法 一次git提交到dev的记录

PowerShell
版权所有（C） Microsoft Corporation。保留所有权利。

安装最新的 PowerShell，了解新功能和改进！https://aka.ms/PSWindows

PS C:\Users\21558> cd root@ecs-ngoprs:~# cd /usr^C
PS C:\Users\21558> cd C:\Users\21558\tsioc\docking-service
PS C:\Users\21558\tsioc\docking-service> git add .
warning: in the working copy of 'frontend/src/api/agricultural/weatherColorScale.js', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'frontend/src/views/agricultural/warningPublishRecord/index.vue', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'frontend/src/views/agricultural/weatherColorScale/index.vue', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'frontend/vue.config.js', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'src/main/java/com/zhcs/docking/controller/AgriculturalWarningPublishRecordController.java', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'src/main/java/com/zhcs/docking/controller/AgriculturalWeatherColorScaleController.java', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'src/main/java/com/zhcs/docking/controller/AgriculturalWeatherWarningController.java', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'src/main/java/com/zhcs/docking/dao/AgriculturalWarningPublishRecordMapper.java', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'src/main/java/com/zhcs/docking/service/AgriculturalWarningPublishRecordService.java', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'src/main/java/com/zhcs/docking/service/AgriculturalWeatherColorScaleService.java', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'src/main/java/com/zhcs/docking/service/impl/AgriculturalWarningPublishRecordServiceImpl.java', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'src/main/java/com/zhcs/docking/service/impl/AgriculturalWeatherColorScaleServiceImpl.java', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'src/main/resources/mapper/AgriculturalWarningPublishRecordMapper.xml', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'frontend/src/components/TokenModal.vue', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'frontend/src/utils/apiConfig.js', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'frontend/src/utils/axiosConfig.js', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'frontend/src/utils/tokenManager.js', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'frontend/src/views/agricultural/warningPublishRecord/index.vue.new', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'src/main/java/com/zhcs/docking/component/dto/AgriculturalWarningDetailDTO.java', LF will be replaced by CRLF the next time Git touches it
PS C:\Users\21558\tsioc\docking-service> git commit -m "tset"
[master 6752e89] tset
27 files changed, 6500 insertions(+), 129 deletions(-)
create mode 100644 frontend/src/components/TokenModal.vue
create mode 100644 frontend/src/utils/apiConfig.js
create mode 100644 frontend/src/utils/axiosConfig.js
create mode 100644 frontend/src/utils/tokenManager.js
create mode 100644 frontend/src/views/agricultural/warningPublishRecord/index.vue.new
create mode 100644 sql/ioc3.sql
create mode 100644 src/main/java/com/zhcs/docking/component/dto/AgriculturalWarningDetailDTO.java
PS C:\Users\21558\tsioc\docking-service> git push origin master
Enumerating objects: 98, done.
Counting objects: 100% (98/98), done.
Delta compression using up to 24 threads
Compressing objects: 100% (48/48), done.
Writing objects: 100% (55/55), 1.37 MiB | 562.00 KiB/s, done.
Total 55 (delta 29), reused 0 (delta 0), pack-reused 0 (from 0)
remote: Powered by GITEE.COM [1.1.5]
remote: Set trace flag 7b4237ab
To https://gitee.com/null_465_7266/tsioc3.git
0cdd2a6..6752e89 master -> master
PS C:\Users\21558\tsioc\docking-service> git add .
warning: in the working copy of 'frontend/src/api/agricultural/pestMonitoringTrend.js', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'frontend/src/api/agricultural/weatherColorScale.js', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'frontend/src/router/index.js', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'frontend/src/views/agricultural/pestMonitoringTrend/index.vue', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'frontend/src/views/agricultural/warningPublishRecord/index.vue', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'frontend/src/views/agricultural/weatherColorScale/index.vue', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'frontend/src/views/agricultural/weatherTrend/index.vue', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'frontend/src/views/weather/forecast40days/index.vue', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'frontend/vue.config.js', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'src/main/java/com/zhcs/docking/component/entity/DroneFlightRoute.java', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'src/main/java/com/zhcs/docking/component/entity/PestMonitoringTrend.java', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'src/main/java/com/zhcs/docking/controller/AgriculturalWarningPublishRecordController.java', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'src/main/java/com/zhcs/docking/controller/AgriculturalWeatherColorScaleController.java', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'src/main/java/com/zhcs/docking/controller/AgriculturalWeatherWarningController.java', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'src/main/java/com/zhcs/docking/controller/DroneFlightRouteController.java', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'src/main/java/com/zhcs/docking/dao/AgriculturalWarningPublishRecordMapper.java', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'src/main/java/com/zhcs/docking/service/AgriculturalWarningPublishRecordService.java', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'src/main/java/com/zhcs/docking/service/AgriculturalWeatherColorScaleService.java', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'src/main/java/com/zhcs/docking/service/impl/AgriculturalWarningPublishRecordServiceImpl.java', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'src/main/java/com/zhcs/docking/service/impl/AgriculturalWeatherColorScaleServiceImpl.java', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'src/main/java/com/zhcs/docking/service/impl/DroneFlightRouteServiceImpl.java', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'src/main/java/com/zhcs/docking/service/impl/WeatherForecast40DaysServiceImpl.java', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'src/main/resources/mapper/AgriculturalWarningPublishRecordMapper.xml', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'frontend/src/api/weather/weatherRealtime.js', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'frontend/src/components/TokenModal.vue', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'frontend/src/utils/apiConfig.js', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'frontend/src/utils/axiosConfig.js', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'frontend/src/utils/tokenManager.js', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'frontend/src/views/agricultural/warningPublishRecord/index.vue.new', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'frontend/src/views/weather/weatherRealtime/index.vue', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'sql/weather_forecast_40_days.sql', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'sql/weather_realtime.sql', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'src/api/weather/weatherRealtime.js', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'src/main/java/com/zhcs/docking/component/dto/AgriculturalWarningDetailDTO.java', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'src/main/java/com/zhcs/docking/component/entity/WeatherRealtime.java', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'src/main/java/com/zhcs/docking/controller/WeatherRealtimeController.java', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'src/main/java/com/zhcs/docking/dao/WeatherRealtimeMapper.java', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'src/main/java/com/zhcs/docking/service/WeatherRealtimeService.java', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'src/main/java/com/zhcs/docking/service/impl/WeatherRealtimeServiceImpl.java', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'src/main/resources/mapper/WeatherForecast40DaysMapper.xml', LF will be replaced by CRLF the next time Git touches it
PS C:\Users\21558\tsioc\docking-service>
PS C:\Users\21558\tsioc\docking-service> ^C
PS C:\Users\21558\tsioc\docking-service> git branch
dev
* dev-gk
master
PS C:\Users\21558\tsioc\docking-service> git add .
PS C:\Users\21558\tsioc\docking-service> git commit -m "提交农产品代码"
[dev-gk 4b36b9a] 提交农产品代码
62 files changed, 9806 insertions(+), 4037 deletions(-)
create mode 100644 frontend/src/api/weather/weatherRealtime.js
create mode 100644 frontend/src/components/TokenModal.vue
create mode 100644 frontend/src/utils/apiConfig.js
create mode 100644 frontend/src/utils/axiosConfig.js
create mode 100644 frontend/src/utils/tokenManager.js
create mode 100644 frontend/src/views/agricultural/warningPublishRecord/index.vue.new
create mode 100644 frontend/src/views/weather/weatherRealtime/index.vue
delete mode 100644 sql/create_agricultural_monitoring_tables.sql
delete mode 100644 sql/create_drought_warning_tables.sql
delete mode 100644 sql/create_weather_warning_plan.sql
delete mode 100644 sql/create_weather_warning_table.sql
rename sql/{ioc.sql => ioc3.sql} (72%)
create mode 100644 sql/weather_forecast_40_days.sql
create mode 100644 sql/weather_realtime.sql
create mode 100644 src/api/weather/weatherRealtime.js
create mode 100644 src/main/java/com/zhcs/docking/component/dto/AgriculturalWarningDetailDTO.java
create mode 100644 src/main/java/com/zhcs/docking/component/entity/WeatherRealtime.java
create mode 100644 src/main/java/com/zhcs/docking/controller/WeatherRealtimeController.java
create mode 100644 src/main/java/com/zhcs/docking/dao/WeatherRealtimeMapper.java
create mode 100644 src/main/java/com/zhcs/docking/service/WeatherRealtimeService.java
create mode 100644 src/main/java/com/zhcs/docking/service/impl/WeatherRealtimeServiceImpl.java
create mode 100644 src/main/resources/mapper/WeatherForecast40DaysMapper.xml
PS C:\Users\21558\tsioc\docking-service> git add .
PS C:\Users\21558\tsioc\docking-service> git commit -m "提交农产品代码"
[dev-gk 5fec056] 提交农产品代码
1 file changed, 5358 insertions(+)
create mode 100644 sql/ioc4.sql
PS C:\Users\21558\tsioc\docking-service> git push origin dev-gk
Enumerating objects: 478, done.
Counting objects: 100% (460/460), done.
Delta compression using up to 24 threads
Compressing objects: 100% (324/324), done.
Writing objects: 100% (371/371), 11.52 MiB | 4.84 MiB/s, done.
Total 371 (delta 194), reused 0 (delta 0), pack-reused 0 (from 0)
remote: Resolving deltas: 100% (194/194), completed with 39 local objects.
To https://code.srdcloud.cn/Z-0150/docking-service
17eb258..5fec056 dev-gk -> dev-gk
PS C:\Users\21558\tsioc\docking-service> git checkout dev
Updating files: 100% (895/895), done.
Switched to branch 'dev'
Your branch and 'origin/dev' have diverged,
and have 1 and 24 different commits each, respectively.
(use "git pull" if you want to integrate the remote branch with yours)
PS C:\Users\21558\tsioc\docking-service> git pull
remote: Enumerating objects: 32, done.
remote: Counting objects: 100% (32/32), done.
remote: Compressing objects: 100% (17/17), done.
remote: Total 23 (delta 8), reused 0 (delta 0), pack-reused 0
Unpacking objects: 100% (23/23), 2.84 KiB | 15.00 KiB/s, done.
From https://code.srdcloud.cn/Z-0150/docking-service
e933b47..db9980c dev-test -> origin/dev-test
Auto-merging src/main/resources/application-local.yml
CONFLICT (content): Merge conflict in src/main/resources/application-local.yml
Automatic merge failed; fix conflicts and then commit the result.
PS C:\Users\21558\tsioc\docking-service> git status
On branch dev
Your branch and 'origin/dev' have diverged,
and have 1 and 24 different commits each, respectively.
(use "git pull" if you want to integrate the remote branch with yours)

All conflicts fixed but you are still merging.
(use "git commit" to conclude merge)

Changes to be committed:
modified: src/main/java/com/zhcs/docking/component/entity/FlightDrone.java
modified: src/main/java/com/zhcs/docking/component/entity/IotEquipmentManagement.java
modified: src/main/java/com/zhcs/docking/component/entity/TaskDis.java
modified: src/main/java/com/zhcs/docking/component/entity/TaskDisProcess.java
new file: src/main/java/com/zhcs/docking/component/enums/TrafficEventStateEnum.java
new file: src/main/java/com/zhcs/docking/component/enums/TrafficEventStatusEnum.java
new file: src/main/java/com/zhcs/docking/component/pojo/request/IotEquipmentQuery.java
new file: src/main/java/com/zhcs/docking/component/pojo/request/IotEquipmentSimpleQuery.java
new file: src/main/java/com/zhcs/docking/component/pojo/request/ResourcesQuery.java
modified: src/main/java/com/zhcs/docking/component/pojo/request/TaskDisQuery.java
new file: src/main/java/com/zhcs/docking/component/pojo/vo/EquipmentListVO.java
new file: src/main/java/com/zhcs/docking/component/pojo/vo/EquipmentVo.java
new file: src/main/java/com/zhcs/docking/component/pojo/vo/FlightDroneVO.java
new file: src/main/java/com/zhcs/docking/component/pojo/vo/IotEquipmentManagementVO.java
new file: src/main/java/com/zhcs/docking/component/pojo/vo/IotEquipmentSimpleListVO.java
modified: src/main/java/com/zhcs/docking/component/pojo/vo/TaskDisVo.java
new file: src/main/java/com/zhcs/docking/component/pojo/vo/TrafficEventStatsVO.java
modified: src/main/java/com/zhcs/docking/component/pojo/vo/TrafficEventVO.java
modified: src/main/java/com/zhcs/docking/component/pojo/vo/TrafficJamVO.java
new file: src/main/java/com/zhcs/docking/component/pojo/vo/TrafficPoliceDeptVO.java
new file: src/main/java/com/zhcs/docking/component/pojo/vo/TrailerVo.java
modified: src/main/java/com/zhcs/docking/controller/IotEquipmentManagementController.java
modified: src/main/java/com/zhcs/docking/controller/TaskDisController.java
modified: src/main/java/com/zhcs/docking/controller/TrafficEventController.java
modified: src/main/java/com/zhcs/docking/controller/TrafficPoliceController.java
modified: src/main/java/com/zhcs/docking/dao/IotEquipmentManagementMapper.java
modified: src/main/java/com/zhcs/docking/dao/TrafficEventMapper.java
modified: src/main/java/com/zhcs/docking/service/BaiduTrafficService.java
modified: src/main/java/com/zhcs/docking/service/IotEquipmentManagementService.java
modified: src/main/java/com/zhcs/docking/service/TaskDisService.java
modified: src/main/java/com/zhcs/docking/service/TrafficEventService.java
modified: src/main/resources/application-local.yml
modified: src/main/resources/mapper/IotEquipmentManagementMapper.xml
modified: src/main/resources/mapper/TaskDisMapper.xml
modified: src/main/resources/mapper/TrafficEventMapper.xml
modified: src/main/resources/sql/init.sql
new file: "src/main/resources/static/mock_data/\344\272\244\351\200\232\345\256\236\346\227\266\347\233\221\346\265\213.json"
new file: "src/main/resources/static/mock_data/\344\272\247\344\270\232\345\217\221\345\261\225\344\270\216\344\272\247\345\223\201\345\223\201\347\211\214\350\256\244\350\257\201\346\203\205\345\206\265.json"
new file: "src/main/resources/static/mock_data/\345\201\234\350\275\246\345\234\272\345\273\272\350\256\276\346\246\202\345\206\265.json"
deleted: "src/main/resources/static/mock_data/\345\206\234\344\270\232\345\237\272\346\234\254\346\203\205\345\206\265.json"
new file: "src/main/resources/static/mock_data/\345\206\234\344\270\232\346\225\264\344\275\223\346\200\201\345\212\277.json"
new file: "src/main/resources/static/mock_data/\345\206\234\344\270\232\346\226\260\345\237\272\345\273\272.json"
deleted: "src/main/resources/static/mock_data/\345\206\234\344\270\232\347\224\237\344\272\247\344\272\247\345\200\274\344\273\245\345\217\212\345\261\205\346\260\221\346\224\266\345\205\245\346\246\202\345\206\265.json"
new file: "src/main/resources/static/mock_data/\345\206\234\344\270\232\347\224\237\344\272\247\344\272\247\351\207\217\346\246\202\350\247\210.json"
new file: "src/main/resources/static/mock_data/\345\206\234\344\272\247\345\223\201\350\256\244\350\257\201\346\203\205\345\206\265.json"
new file: "src/main/resources/static/mock_data/\345\237\216\345\270\202\347\256\241\347\220\206.json"
new file: "src/main/resources/static/mock_data/\345\237\272\347\241\200\346\246\202\345\206\265\347\273\237\350\256\241.json"
new file: "src/main/resources/static/mock_data/\345\237\272\347\241\200\350\246\201\347\264\240.json"
new file: "src/main/resources/static/mock_data/\345\274\202\345\270\270\347\233\221\346\265\213\345\221\212\350\255\246.json"
new file: "src/main/resources/static/mock_data/\347\273\217\346\265\216\344\272\247\344\270\232.json"
new file: "src/main/resources/static/mock_data/\350\241\214\344\270\232\345\210\206\346\236\220.json"
new file: "src/main/resources/static/mock_data/\351\207\215\347\202\271\345\206\234\344\272\247\345\223\201\351\224\200\345\224\256\344\273\267\346\240\274\345\217\212\347\224\265\345\225\206\351\224\200\345\224\256\346\203\205\345\206\265.json"

PS C:\Users\21558\tsioc\docking-service> git push
To https://code.srdcloud.cn/Z-0150/docking-service
! [rejected] dev -> dev (non-fast-forward)
error: failed to push some refs to 'https://code.srdcloud.cn/Z-0150/docking-service'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. If you want to integrate the remote changes,
hint: use 'git pull' before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
PS C:\Users\21558\tsioc\docking-service> git add .
PS C:\Users\21558\tsioc\docking-service> git commit -m "pull dev code, modify conflict"
[dev c358ee0] pull dev code, modify conflict
PS C:\Users\21558\tsioc\docking-service> git push
Enumerating objects: 68, done.
Counting objects: 100% (60/60), done.
Delta compression using up to 24 threads
Compressing objects: 100% (26/26), done.
Writing objects: 100% (30/30), 74.07 MiB | 1.73 MiB/s, done.
Total 30 (delta 17), reused 0 (delta 0), pack-reused 0 (from 0)
To https://code.srdcloud.cn/Z-0150/docking-service
5595346..c358ee0 dev -> dev
PS C:\Users\21558\tsioc\docking-service> git merge dev-gk
Auto-merging frontend/src/views/weather/WeatherAlertManagement.vue
CONFLICT (content): Merge conflict in frontend/src/views/weather/WeatherAlertManagement.vue
Auto-merging src/main/java/com/zhcs/docking/DockingServiceApplication.java
CONFLICT (content): Merge conflict in src/main/java/com/zhcs/docking/DockingServiceApplication.java
CONFLICT (modify/delete): src/main/java/com/zhcs/docking/common/HttpClientGenerator.java deleted in HEAD and modified in dev-gk. Version dev-gk of src/main/java/com/zhcs/docking/common/HttpClientGenerator.java left in tree.
Auto-merging src/main/java/com/zhcs/docking/component/entity/WeatherAlert.java
CONFLICT (content): Merge conflict in src/main/java/com/zhcs/docking/component/entity/WeatherAlert.java
Auto-merging src/main/java/com/zhcs/docking/controller/AccidentTypesController.java
CONFLICT (content): Merge conflict in src/main/java/com/zhcs/docking/controller/AccidentTypesController.java
Auto-merging src/main/java/com/zhcs/docking/controller/AdministrativeDivisionController.java
CONFLICT (content): Merge conflict in src/main/java/com/zhcs/docking/controller/AdministrativeDivisionController.java
Auto-merging src/main/java/com/zhcs/docking/controller/AgriculturalDroughtPreventionPlanController.java
CONFLICT (content): Merge conflict in src/main/java/com/zhcs/docking/controller/AgriculturalDroughtPreventionPlanController.java
Auto-merging src/main/java/com/zhcs/docking/controller/AgriculturalOverviewController.java
CONFLICT (content): Merge conflict in src/main/java/com/zhcs/docking/controller/AgriculturalOverviewController.java
Auto-merging src/main/java/com/zhcs/docking/controller/DistrictParkingStatisticsController.java
CONFLICT (content): Merge conflict in src/main/java/com/zhcs/docking/controller/DistrictParkingStatisticsController.java
Auto-merging src/main/java/com/zhcs/docking/controller/DistrictsController.java
CONFLICT (content): Merge conflict in src/main/java/com/zhcs/docking/controller/DistrictsController.java
Auto-merging src/main/java/com/zhcs/docking/controller/EventActionTypesController.java
CONFLICT (content): Merge conflict in src/main/java/com/zhcs/docking/controller/EventActionTypesController.java
Auto-merging src/main/java/com/zhcs/docking/controller/EventScoringController.java
CONFLICT (content): Merge conflict in src/main/java/com/zhcs/docking/controller/EventScoringController.java
Auto-merging src/main/java/com/zhcs/docking/controller/EventSeverityLevelsController.java
CONFLICT (content): Merge conflict in src/main/java/com/zhcs/docking/controller/EventSeverityLevelsController.java
Auto-merging src/main/java/com/zhcs/docking/controller/EventSourcesController.java
CONFLICT (content): Merge conflict in src/main/java/com/zhcs/docking/controller/EventSourcesController.java
Auto-merging src/main/java/com/zhcs/docking/controller/EventStatusesController.java
CONFLICT (content): Merge conflict in src/main/java/com/zhcs/docking/controller/EventStatusesController.java
Auto-merging src/main/java/com/zhcs/docking/controller/EventTypesController.java
CONFLICT (content): Merge conflict in src/main/java/com/zhcs/docking/controller/EventTypesController.java
Auto-merging src/main/java/com/zhcs/docking/controller/EventWorkflowLogsController.java
CONFLICT (content): Merge conflict in src/main/java/com/zhcs/docking/controller/EventWorkflowLogsController.java
Auto-merging src/main/java/com/zhcs/docking/controller/EventWorkflowStagesController.java
CONFLICT (content): Merge conflict in src/main/java/com/zhcs/docking/controller/EventWorkflowStagesController.java
Auto-merging src/main/java/com/zhcs/docking/controller/GovcomInterController.java
CONFLICT (content): Merge conflict in src/main/java/com/zhcs/docking/controller/GovcomInterController.java
Auto-merging src/main/java/com/zhcs/docking/controller/WeatherForecast40DaysController.java
Auto-merging src/main/java/com/zhcs/docking/service/AgriculturalDroughtPreventionPlanService.java
Auto-merging src/main/java/com/zhcs/docking/service/DistrictParkingStatisticsService.java
CONFLICT (content): Merge conflict in src/main/java/com/zhcs/docking/service/DistrictParkingStatisticsService.java
Auto-merging src/main/java/com/zhcs/docking/service/DistrictsService.java
CONFLICT (content): Merge conflict in src/main/java/com/zhcs/docking/service/DistrictsService.java
Auto-merging src/main/java/com/zhcs/docking/service/EventActionTypesService.java
CONFLICT (content): Merge conflict in src/main/java/com/zhcs/docking/service/EventActionTypesService.java
Auto-merging src/main/java/com/zhcs/docking/service/EventScoringService.java
CONFLICT (content): Merge conflict in src/main/java/com/zhcs/docking/service/EventScoringService.java
Auto-merging src/main/java/com/zhcs/docking/service/EventSeverityLevelsService.java
CONFLICT (content): Merge conflict in src/main/java/com/zhcs/docking/service/EventSeverityLevelsService.java
Auto-merging src/main/java/com/zhcs/docking/service/EventSourcesService.java
CONFLICT (content): Merge conflict in src/main/java/com/zhcs/docking/service/EventSourcesService.java
Auto-merging src/main/java/com/zhcs/docking/service/EventStatusesService.java
CONFLICT (content): Merge conflict in src/main/java/com/zhcs/docking/service/EventStatusesService.java
Auto-merging src/main/java/com/zhcs/docking/service/EventTypesService.java
CONFLICT (content): Merge conflict in src/main/java/com/zhcs/docking/service/EventTypesService.java
Auto-merging src/main/java/com/zhcs/docking/service/EventWorkflowLogsService.java
CONFLICT (content): Merge conflict in src/main/java/com/zhcs/docking/service/EventWorkflowLogsService.java
Auto-merging src/main/java/com/zhcs/docking/service/EventWorkflowStagesService.java
CONFLICT (content): Merge conflict in src/main/java/com/zhcs/docking/service/EventWorkflowStagesService.java
Auto-merging src/main/java/com/zhcs/docking/service/GovNoticeService.java
CONFLICT (content): Merge conflict in src/main/java/com/zhcs/docking/service/GovNoticeService.java
Auto-merging src/main/java/com/zhcs/docking/service/WeatherForecast40DaysService.java
Auto-merging src/main/java/com/zhcs/docking/service/impl/AgriculturalDroughtPreventionPlanServiceImpl.java
CONFLICT (content): Merge conflict in src/main/java/com/zhcs/docking/service/impl/AgriculturalDroughtPreventionPlanServiceImpl.java
Auto-merging src/main/java/com/zhcs/docking/service/impl/DistrictParkingStatisticsServiceImpl.java
CONFLICT (content): Merge conflict in src/main/java/com/zhcs/docking/service/impl/DistrictParkingStatisticsServiceImpl.java
Auto-merging src/main/java/com/zhcs/docking/service/impl/EventActionTypesServiceImpl.java
CONFLICT (content): Merge conflict in src/main/java/com/zhcs/docking/service/impl/EventActionTypesServiceImpl.java
Auto-merging src/main/java/com/zhcs/docking/service/impl/EventScoringServiceImpl.java
CONFLICT (content): Merge conflict in src/main/java/com/zhcs/docking/service/impl/EventScoringServiceImpl.java
Auto-merging src/main/java/com/zhcs/docking/service/impl/EventSeverityLevelsServiceImpl.java
CONFLICT (content): Merge conflict in src/main/java/com/zhcs/docking/service/impl/EventSeverityLevelsServiceImpl.java
Auto-merging src/main/java/com/zhcs/docking/service/impl/EventSourcesServiceImpl.java
CONFLICT (content): Merge conflict in src/main/java/com/zhcs/docking/service/impl/EventSourcesServiceImpl.java
Auto-merging src/main/java/com/zhcs/docking/service/impl/EventStatusesServiceImpl.java
CONFLICT (content): Merge conflict in src/main/java/com/zhcs/docking/service/impl/EventStatusesServiceImpl.java
Auto-merging src/main/java/com/zhcs/docking/service/impl/EventTypesServiceImpl.java
CONFLICT (content): Merge conflict in src/main/java/com/zhcs/docking/service/impl/EventTypesServiceImpl.java
Auto-merging src/main/java/com/zhcs/docking/service/impl/EventWorkflowLogsServiceImpl.java
CONFLICT (content): Merge conflict in src/main/java/com/zhcs/docking/service/impl/EventWorkflowLogsServiceImpl.java
Auto-merging src/main/java/com/zhcs/docking/service/impl/EventWorkflowStagesServiceImpl.java
CONFLICT (content): Merge conflict in src/main/java/com/zhcs/docking/service/impl/EventWorkflowStagesServiceImpl.java
Auto-merging src/main/java/com/zhcs/docking/service/impl/WeatherForecast40DaysServiceImpl.java
CONFLICT (content): Merge conflict in src/main/java/com/zhcs/docking/service/impl/WeatherForecast40DaysServiceImpl.java
Auto-merging src/main/resources/application-local.yml
CONFLICT (content): Merge conflict in src/main/resources/application-local.yml
Auto-merging src/main/resources/application.yml
CONFLICT (content): Merge conflict in src/main/resources/application.yml
Auto-merging src/main/resources/sql/init.sql
CONFLICT (content): Merge conflict in src/main/resources/sql/init.sql
Automatic merge failed; fix conflicts and then commit the result.
PS C:\Users\21558\tsioc\docking-service> git merge dev-gk

 

 

 

 

 

 

 

 

 

 

git merge dev-gk^C
PS C:\Users\21558\tsioc\docking-service> ^C
PS C:\Users\21558\tsioc\docking-service> git add .^C
PS C:\Users\21558\tsioc\docking-service> ^C
PS C:\Users\21558\tsioc\docking-service> ^C
PS C:\Users\21558\tsioc\docking-service> git add .
warning: in the working copy of 'frontend/src/views/weather/WeatherAlertManagement.vue', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'src/main/resources/sql/init.sql', LF will be replaced by CRLF the next time Git touches it
PS C:\Users\21558\tsioc\docking-service> git commit -m "feat: 新增农产品相关功能"
[dev 10fd30e] feat: 新增农产品相关功能
PS C:\Users\21558\tsioc\docking-service> git push origin dev
Enumerating objects: 108, done.
Counting objects: 100% (108/108), done.
Delta compression using up to 24 threads
Compressing objects: 100% (41/41), done.
Writing objects: 100% (44/44), 23.73 KiB | 1.13 MiB/s, done.
Total 44 (delta 29), reused 0 (delta 0), pack-reused 0 (from 0)
To https://code.srdcloud.cn/Z-0150/docking-service
c358ee0..10fd30e dev -> dev
PS C:\Users\21558\tsioc\docking-service> git log --graph --oneli