Skip to content

feat:草稿并发修改交互优化 #10553#12652

Open
mingshewhe wants to merge 41 commits into
TencentBlueKing:masterfrom
mingshewhe:feat_10553
Open

feat:草稿并发修改交互优化 #10553#12652
mingshewhe wants to merge 41 commits into
TencentBlueKing:masterfrom
mingshewhe:feat_10553

Conversation

@mingshewhe

Copy link
Copy Markdown
Collaborator

# Conflicts:
#	src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/api/user/UserPipelineVersionResource.kt
#	src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/constant/ProcessMessageCode.kt
#	src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/service/PipelineRepositoryVersionService.kt
#	src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/api/UserPipelineVersionResourceImpl.kt
#	src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/PipelineVersionFacadeService.kt
#	src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/pipeline/version/convert/PipelineDraftSaveReqConverter.kt
#	src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/template/v2/PipelineTemplateResourceService.kt
#	support-files/sql/2025_v4.x/2025_ci_process-update_v4.0_mysql.sql

# Conflicts:
#	src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/constant/ProcessMessageCode.kt
@mingshewhe mingshewhe closed this Mar 3, 2026
@mingshewhe mingshewhe reopened this Mar 3, 2026
# Conflicts:
#	src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/api/template/v2/UserPipelineTemplateV2Resource.kt
#	src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/constant/ProcessMessageCode.kt
#	src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/pojo/pipeline/PipelineResourceOnlyVersion.kt
#	src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/pojo/pipeline/PipelineResourceVersion.kt
#	src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/api/template/v2/UserPipelineTemplateV2ResourceImpl.kt
#	src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/PipelineVersionFacadeService.kt
#	src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/pipeline/version/PipelineVersionGenerator.kt
#	src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/pipeline/version/convert/PipelineDraftSaveReqConverter.kt
#	src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/template/v2/PipelineTemplateGenerator.kt
#	src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/template/v2/PipelineTemplatePersistenceService.kt
#	src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/template/v2/PipelineTemplateResourceService.kt
#	src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/template/v2/version/convert/PipelineTemplateDraftRollbackReqConverter.kt
#	src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/template/v2/version/convert/PipelineTemplateDraftSaveReqConverter.kt
#	src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/template/v2/version/hander/PipelineTemplateDraftSaveHandler.kt
#	src/backend/ci/core/process/biz-process/src/test/kotlin/com/tencent/devops/process/service/template/v2/PipelineTemplateGeneratorTest.kt
@mingshewhe mingshewhe closed this Apr 27, 2026
@mingshewhe mingshewhe reopened this Apr 27, 2026
@mingshewhe mingshewhe closed this Apr 27, 2026
@mingshewhe mingshewhe reopened this Apr 27, 2026
# Conflicts:
#	src/backend/ci/core/misc/biz-misc/src/main/kotlin/com/tencent/devops/misc/cron/process/PipelineBuildHistoryDataClearJob.kt
#	src/backend/ci/core/misc/biz-misc/src/main/kotlin/com/tencent/devops/misc/dao/process/ProcessDataDeleteDao.kt
#	src/backend/ci/core/misc/biz-misc/src/main/kotlin/com/tencent/devops/misc/service/process/ProcessDataClearService.kt
#	src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/constant/ProcessMessageCode.kt
#	src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/pipeline/version/PipelineVersionPersistenceService.kt
#	src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/pipeline/version/convert/PipelineVersionCreateContextFactory.kt
#	support-files/sql/2025_v4.x/2025_ci_process-update_v4.0_mysql.sql
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants