five-groups
/
five-groups-couplet
4
0
Fork 0
Code Issues Pull Requests 2 Packages Projects Releases Wiki Activity

1111 #2

Open
lijiayao wants to merge 2 commits from server_five_fufanrui into server_five
pull from: server_five_fufanrui
merge into: five-groups:server_five
Conversation 0 Commits 2 Files Changed 16
lijiayao commented 2024-04-06 11:04:23 +08:00
Owner
There is no content yet.
lijiayao added 1 commit 2024-04-06 11:04:23 +08:00
xiaofu added 1 commit 2024-04-06 11:39:52 +08:00
xiaofu added 1 commit 2024-04-06 11:51:00 +08:00
xiaofu added 1 commit 2024-04-06 16:34:48 +08:00
xiaofu added 1 commit 2024-04-06 20:07:04 +08:00
xiaofu added 1 commit 2024-04-07 11:06:01 +08:00
xiaofu added 1 commit 2024-04-07 14:35:47 +08:00
xiaofu added 1 commit 2024-04-08 09:59:58 +08:00
xiaofu added 1 commit 2024-04-08 10:55:41 +08:00
xiaofu added 1 commit 2024-04-08 11:20:14 +08:00
xiaofu added 1 commit 2024-04-08 14:23:07 +08:00
xiaofu added 2 commits 2024-04-08 21:55:45 +08:00
31e78c3c3c Merge branch 'server_five' of https://gitea.qinmian.online/five-groups/five-groups-couplet into server_five_fufanrui 
# Conflicts:
#	couplet-modules/couplet-business/pom.xml
#	couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/impl/VehicleDetectionServiceImpl.java
#	couplet-modules/couplet-business/src/main/resources/bootstrap.yml
#	couplet-visual/couplet-monitor/src/main/resources/bootstrap.yml
xiaofu added 1 commit 2024-04-09 08:42:56 +08:00
xiaofu added 3 commits 2024-04-09 15:23:50 +08:00
xiaofu added 2 commits 2024-04-09 16:05:23 +08:00
f1938e4e3e Merge branch 'server_five' of https://gitea.qinmian.online/five-groups/five-groups-couplet into server_five_fufanrui 
# Conflicts:
#	couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/model/ModelsKafkaMessage.java
#	couplet-modules/couplet-modules-onLine/src/main/java/com/couplet/online/utils/MqttMonitor.java
#	couplet-modules/couplet-modules-onLine/src/main/resources/bootstrap.yml
xiaofu added 1 commit 2024-04-09 18:41:03 +08:00
xiaofu added 1 commit 2024-04-12 08:35:24 +08:00
This pull request can be merged automatically.
This branch is out-of-date with the base branch
You are not authorized to merge this pull request.
You can also view command line instructions.

Step 1:

From your project repository, check out a new branch and test the changes.
git checkout -b server_five_fufanrui server_five
git pull origin server_five_fufanrui

Step 2:

Merge the changes and update on Gitea.
git checkout server_five
git merge --no-ff server_five_fufanrui
git push origin server_five
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No Label
Milestone
Clear milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: five-groups/five-groups-couplet#2
There is no content yet.
Delete Branch "server_five_fufanrui"

Deleting a branch is permanent. Although the deleted branch may exist for a short time before cleaning up, in most cases it CANNOT be undone. Continue?