1
2
3
4
5
6
7
8
9
10
11
12
13
14
| ➜ bang-api git:(p1w37) git cherry-pick 3e785fc8c072e46660c2194a6c5006e93309f08f
Auto-merging app/services/batch/copy_project.go
[p1w37 957e05d996] fix #328031 并发复制项目uuid重复的问题
Date: Mon Aug 22 15:49:05 2022 +0800
1 file changed, 4 insertions(+), 1 deletion(-)
➜ bang-api git:(p1w37) git checkout hotfix_320269
Switched to branch 'hotfix_320269'
Your branch is up to date with 'origin/hotfix_320269'.
➜ bang-api git:(hotfix_320269) git log
➜ bang-api git:(hotfix_320269) git checkout p1w37
Switched to branch 'p1w37'
Your branch is ahead of 'origin/p1w37' by 1 commit.
(use "git push" to publish your local commits)
➜ bang-api git:(p1w37) git cherry-pick -n -e cce2d9d6579a734a7f644ea811c1636a9d03a199..0c2a52efdc4bc2ca8f0c051208e68831388e197e
|