kubesphere/ks-devops

[release-3.3] format code with lint

ks-ci-bot opened this issue · 0 comments

Manual cherrypick required.

#897 failed to apply on top of branch "release-3.3":

Applying: add printer-column(ID) for pipelinerun
Using index info to reconstruct a base tree...
M	config/crd/bases/devops.kubesphere.io_pipelineruns.yaml
M	pkg/api/devops/v1alpha3/pipelinerun_types.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/api/devops/v1alpha3/pipelinerun_types.go
Auto-merging config/crd/bases/devops.kubesphere.io_pipelineruns.yaml
No changes -- Patch already applied.
Applying: bugfix: pipelinerun status from cancelled to not-running
Using index info to reconstruct a base tree...
M	controllers/jenkins/pipelinerun/pipelinerun_controller.go
Falling back to patching base and 3-way merge...
Auto-merging controllers/jenkins/pipelinerun/pipelinerun_controller.go
CONFLICT (content): Merge conflict in controllers/jenkins/pipelinerun/pipelinerun_controller.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 bugfix: pipelinerun status from cancelled to not-running
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".