Skip to content

Actions: gzhao9/cloudstack

Actions

PR Merge Conflict Check

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
merge-conflict-checker.yml
40 workflow runs
40 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Merge branch '4.19' PR Merge Conflict Check #40: Commit 21d107c pushed by gzhao9
September 25, 2024 12:24 16s main
main
September 25, 2024 12:24 16s
Improve some UserVmManagerImpl's methods name and docs (#8673) PR Merge Conflict Check #39: Commit 8f6721e pushed by gzhao9
February 23, 2024 01:10 16s main
main
February 23, 2024 01:10 16s
Fix KVM unmanage disks path (#8483) PR Merge Conflict Check #38: Commit 59e78cb pushed by gzhao9
January 11, 2024 17:57 15s main
main
January 11, 2024 17:57 15s
Add static methods to avoid duplicate creation of new PR Merge Conflict Check #37: Commit 5deb5dd pushed by gzhao9
November 2, 2023 16:28 19s refactoring-org.apache.cloudstack.network.tungsten.service
refactoring-org.apache.cloudstack.network.tungsten.service
November 2, 2023 16:28 19s
adding static PR Merge Conflict Check #36: Commit a166824 pushed by gzhao9
November 1, 2023 20:56 14s refactor-136-ContrailManagerImpl-across
refactor-136-ContrailManagerImpl-across
November 1, 2023 20:56 14s
ui: fix snapshot copy actions for non-rootadmins (#8164) PR Merge Conflict Check #35: Commit 2dac6cb pushed by gzhao9
November 1, 2023 20:34 19s main
main
November 1, 2023 20:34 19s
Apply suggestions from code review PR Merge Conflict Check #34: Commit a5b5015 pushed by gzhao9
October 25, 2023 13:39 13s refactor-146-VolumeTO
refactor-146-VolumeTO
October 25, 2023 13:39 13s
Apply suggestions from code review PR Merge Conflict Check #33: Commit 3fc0c71 pushed by gzhao9
October 25, 2023 13:38 19s refactor-136-ContrailManagerImpl-across
refactor-136-ContrailManagerImpl-across
October 25, 2023 13:38 19s
Update XenServer610WrapperTest.java PR Merge Conflict Check #32: Commit b6369bc pushed by gzhao9
October 24, 2023 18:39 13s refactor-testMigrateWithStorageCommand
refactor-testMigrateWithStorageCommand
October 24, 2023 18:39 13s
Update XenServer610WrapperTest.java PR Merge Conflict Check #31: Commit b6369bc pushed by gzhao9
October 24, 2023 18:06 14s refactor-146-VolumeTO
refactor-146-VolumeTO
October 24, 2023 18:06 14s
Update XenServer610WrapperTest.java PR Merge Conflict Check #30: Commit b6369bc pushed by gzhao9
October 24, 2023 17:59 12s refactor-testMigrateWithStorageCommand
refactor-testMigrateWithStorageCommand
October 24, 2023 17:59 12s
api,server,ui: snapshot copy, multi-zone replica (#7873) PR Merge Conflict Check #29: Commit 543c54c pushed by gzhao9
October 24, 2023 17:22 17s refactor-testMigrateWithStorageCommand
refactor-testMigrateWithStorageCommand
October 24, 2023 17:22 17s
refactor MockNetworkVO PR Merge Conflict Check #28: Commit 4cb6c4f pushed by gzhao9
October 24, 2023 17:09 16s refactor-136-ContrailManagerImpl-across
refactor-136-ContrailManagerImpl-across
October 24, 2023 17:09 16s
api,server,ui: snapshot copy, multi-zone replica (#7873) PR Merge Conflict Check #27: Commit 543c54c pushed by gzhao9
October 24, 2023 16:35 18s refactor-136-ContrailManagerImpl-across
refactor-136-ContrailManagerImpl-across
October 24, 2023 16:35 18s
update ling ending PR Merge Conflict Check #26: Commit 66f5737 pushed by gzhao9
October 24, 2023 15:53 7m 7s refactoring-org.apache.cloudstack.network.tungsten.service
refactoring-org.apache.cloudstack.network.tungsten.service
October 24, 2023 15:53 7m 7s
Merge branch 'refactoring-org.apache.cloudstack.network.tungsten.serv… PR Merge Conflict Check #25: Commit 0c61bcf pushed by gzhao9
October 24, 2023 15:49 15s refactoring-org.apache.cloudstack.network.tungsten.service
refactoring-org.apache.cloudstack.network.tungsten.service
October 24, 2023 15:49 15s
Merge branch 'main' into refactoring-org.apache.cloudstack.network.tu… PR Merge Conflict Check #24: Commit 6dd5b88 pushed by gzhao9
October 24, 2023 15:29 15s refactoring-org.apache.cloudstack.network.tungsten.service
refactoring-org.apache.cloudstack.network.tungsten.service
October 24, 2023 15:29 15s
reupdate PR Merge Conflict Check #23: Commit 1e1c8a2 pushed by gzhao9
October 20, 2023 15:06 16s refactoring-org.apache.cloudstack.network.tungsten.service
refactoring-org.apache.cloudstack.network.tungsten.service
October 20, 2023 15:06 16s
1 PR Merge Conflict Check #22: Commit 8b0675a pushed by gzhao9
October 19, 2023 12:50 14s Global-refactoring
Global-refactoring
October 19, 2023 12:50 14s
pre-commit: standardize more line endings to lf (#7804) PR Merge Conflict Check #21: Commit 9834d51 pushed by gzhao9
October 18, 2023 18:31 16s main
main
October 18, 2023 18:31 16s
Update UserVmManagerImplTest.java PR Merge Conflict Check #20: Commit 8530432 pushed by gzhao9
October 18, 2023 18:31 18s Global-refactoring
Global-refactoring
October 18, 2023 18:31 18s
Replace all \r with \n. PR Merge Conflict Check #19: Commit 3985310 pushed by gzhao9
October 18, 2023 17:12 12s refactoring-org.apache.cloudstack.network.tungsten.service
refactoring-org.apache.cloudstack.network.tungsten.service
October 18, 2023 17:12 12s
Replace all \r with \n. PR Merge Conflict Check #18: Commit 526d38c pushed by gzhao9
October 18, 2023 17:10 15s refactoring-org.apache.cloudstack.network.tungsten.service
refactoring-org.apache.cloudstack.network.tungsten.service
October 18, 2023 17:10 15s
Revised in accordance with the latest update PR Merge Conflict Check #17: Commit f525d60 pushed by gzhao9
October 18, 2023 12:26 20s refactoring-org.apache.cloudstack.network.tungsten.service
refactoring-org.apache.cloudstack.network.tungsten.service
October 18, 2023 12:26 20s
Merge branch 'apache:main' into refactoring-org.apache.cloudstack.net… PR Merge Conflict Check #16: Commit fde8fad pushed by gzhao9
October 18, 2023 11:38 12s refactoring-org.apache.cloudstack.network.tungsten.service
refactoring-org.apache.cloudstack.network.tungsten.service
October 18, 2023 11:38 12s