Skip to content

Actions: henriqueccmac/Anki-Android

Actions

Conflict Scan

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflict.yaml
This workflow will be disabled soon because there's no recent activity in the repository.
22 workflow runs
22 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Merge branch 'ankidroid:main' into featureWorkaroundAvi Conflict Scan #22: Commit 6b155e1 pushed by henriqueccmac
June 16, 2024 14:57 14s featureWorkaroundAvi
featureWorkaroundAvi
June 16, 2024 14:57 14s
fix #15772: implemented .avi video playback Conflict Scan #21: Commit 142998c pushed by henriqueccmac
June 3, 2024 22:57 12s featureWorkaroundAvi
featureWorkaroundAvi
June 3, 2024 22:57 12s
fix #15772: implemented .avi video playback Conflict Scan #20: Commit aa43e5b pushed by henriqueccmac
June 3, 2024 18:35 13s featureWorkaroundAvi
featureWorkaroundAvi
June 3, 2024 18:35 13s
fix #15772: implemented .avi video playback Conflict Scan #19: Commit 00a2b74 pushed by henriqueccmac
June 3, 2024 18:35 11s featureWorkaroundAvi
featureWorkaroundAvi
June 3, 2024 18:35 11s
fix #15772: implemented .avi video playback Conflict Scan #18: Commit cd294ea pushed by henriqueccmac
June 3, 2024 18:33 13s featureWorkaroundAvi
featureWorkaroundAvi
June 3, 2024 18:33 13s
fix #15772: implemented .avi video playback Conflict Scan #17: Commit 7e1aa05 pushed by henriqueccmac
June 3, 2024 18:15 17s featureWorkaroundAvi
featureWorkaroundAvi
June 3, 2024 18:15 17s
fix #15772: implemented .avi video playback Conflict Scan #16: Commit 18c4323 pushed by henriqueccmac
June 3, 2024 18:13 11s featureWorkaroundAvi
featureWorkaroundAvi
June 3, 2024 18:13 11s
fix #15772: implemented .avi video playback Conflict Scan #15: Commit 04857b1 pushed by henriqueccmac
June 3, 2024 18:12 11s featureWorkaroundAvi
featureWorkaroundAvi
June 3, 2024 18:12 11s
fix #15772: implemented .avi video playback Conflict Scan #14: Commit 198af78 pushed by henriqueccmac
June 3, 2024 18:11 17s featureWorkaroundAvi
featureWorkaroundAvi
June 3, 2024 18:11 17s
fix #15772: implemented .avi video playback Conflict Scan #13: Commit d6fb334 pushed by henriqueccmac
June 3, 2024 18:09 12s featureWorkaroundAvi
featureWorkaroundAvi
June 3, 2024 18:09 12s
fix #15772: implemented .avi video playback Conflict Scan #12: Commit f48042b pushed by henriqueccmac
June 3, 2024 18:06 13s featureWorkaroundAvi
featureWorkaroundAvi
June 3, 2024 18:06 13s
fix #15772: implemented .avi video playback Conflict Scan #11: Commit ca6e7db pushed by henriqueccmac
June 3, 2024 18:04 12s featureWorkaroundAvi
featureWorkaroundAvi
June 3, 2024 18:04 12s
fix #15772: implemented .avi video playback Conflict Scan #10: Commit f69f19e pushed by henriqueccmac
June 3, 2024 18:03 15s featureWorkaroundAvi
featureWorkaroundAvi
June 3, 2024 18:03 15s
fix #15772: implemented .avi video playback Conflict Scan #9: Commit 03243da pushed by henriqueccmac
May 27, 2024 15:02 12s featureWorkaroundAvi
featureWorkaroundAvi
May 27, 2024 15:02 12s
fix #15772: implemented .avi video playback Conflict Scan #8: Commit e1ec865 pushed by henriqueccmac
May 27, 2024 14:59 11s featureWorkaroundAvi
featureWorkaroundAvi
May 27, 2024 14:59 11s
Merge branch 'ankidroid:main' Conflict Scan #7: Commit cb783a5 pushed by henriqueccmac
May 27, 2024 14:54 12s FeatureAviWorkaround
FeatureAviWorkaround
May 27, 2024 14:54 12s
Merge branch 'ankidroid:main' into aviWorkaroundFeature Conflict Scan #6: Commit 1bf40fb pushed by henriqueccmac
May 27, 2024 14:53 10s FeatureAviWorkaround
FeatureAviWorkaround
May 27, 2024 14:53 10s
Merge branch 'ankidroid:main' into aviWorkaroundFeature Conflict Scan #5: Commit f5fc466 pushed by henriqueccmac
May 27, 2024 14:51 11s FeatureAviWorkaround
FeatureAviWorkaround
May 27, 2024 14:51 11s
Merge branch 'ankidroid:main' into aviWorkaroundFeature Conflict Scan #4: Commit 56a14ad pushed by henriqueccmac
May 27, 2024 14:11 12s FeatureAviWorkaround
FeatureAviWorkaround
May 27, 2024 14:11 12s
Merge branch 'ankidroid:main' into aviWorkaroundFeature Conflict Scan #3: Commit 01c0953 pushed by henriqueccmac
May 27, 2024 14:04 10s FeatureAviWorkaround
FeatureAviWorkaround
May 27, 2024 14:04 10s
Merge branch 'ankidroid:main' into aviWorkaroundFeature Conflict Scan #2: Commit 01c0953 pushed by henriqueccmac
May 27, 2024 13:59 11s aviWorkaroundFeature
aviWorkaroundFeature
May 27, 2024 13:59 11s
Merge branch 'ankidroid:main' into aviWorkaroundFeature Conflict Scan #1: Commit 01c0953 pushed by henriqueccmac
May 27, 2024 13:57 10s WorkaroundAviFeature
WorkaroundAviFeature
May 27, 2024 13:57 10s