Skip to content

Actions: jellyfin/jellyfin-android

Actions

Repo / Label merge conflict

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
repo-merge-conflict.yaml
1,007 workflow runs
1,007 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Update dependency androidx.core:core to v1.15.0 Repo / Label merge conflict #2183: Pull request #1554 synchronize by renovate bot
January 26, 2025 16:37 10s
January 26, 2025 16:37 10s
Update dependency androidx.core:core to v1.15.0 Repo / Label merge conflict #2182: Commit 2ed0a16 pushed by renovate bot
January 26, 2025 16:37 11s renovate/androidx.core
renovate/androidx.core
January 26, 2025 16:37 11s
Compile against SDK 35 (Android 15) Repo / Label merge conflict #2181: Commit be9f01c pushed by nielsvanvelzen
January 26, 2025 16:22 2m 11s master
master
January 26, 2025 16:22 2m 11s
Load media session artwork from content provider Repo / Label merge conflict #2180: Commit edf5e2f pushed by Maxr1998
January 26, 2025 03:18 9s image-provider
image-provider
January 26, 2025 03:18 9s
Load notification artwork from session with new content provider Repo / Label merge conflict #2179: Commit 3a98427 pushed by Maxr1998
January 26, 2025 03:14 9s image-provider
image-provider
January 26, 2025 03:14 9s
Load notification artwork from session with new content provider Repo / Label merge conflict #2178: Commit 12a0e4e pushed by Maxr1998
January 26, 2025 03:11 8s image-provider
image-provider
January 26, 2025 03:11 8s
Compile against SDK 35 (Android 15) Repo / Label merge conflict #2177: Commit e49acef pushed by Maxr1998
January 26, 2025 03:02 11s compile-35
compile-35
January 26, 2025 03:02 11s
Update android.plugin to v8.8.0 (#1438) Repo / Label merge conflict #2176: Commit 95ef468 pushed by Maxr1998
January 26, 2025 03:01 2m 11s master
master
January 26, 2025 03:01 2m 11s
Update android.plugin to v8.8.0 Repo / Label merge conflict #2175: Pull request #1438 synchronize by renovate bot
January 26, 2025 02:57 9s
January 26, 2025 02:57 9s
Update android.plugin to v8.8.0 Repo / Label merge conflict #2174: Commit fa69afa pushed by renovate bot
January 26, 2025 02:57 10s renovate/android.plugin
renovate/android.plugin
January 26, 2025 02:57 10s
Update dependency androidx.compose.foundation:foundation to v1.7.6 (#… Repo / Label merge conflict #2173: Commit 44a8a8b pushed by Maxr1998
January 26, 2025 02:54 2m 10s master
master
January 26, 2025 02:54 2m 10s
Update dependency androidx.compose.foundation:foundation to v1.7.6 Repo / Label merge conflict #2172: Pull request #1551 synchronize by renovate bot
January 26, 2025 02:50 10s
January 26, 2025 02:50 10s
Update dependency androidx.compose.foundation:foundation to v1.7.6 Repo / Label merge conflict #2171: Commit 6f63fac pushed by renovate bot
January 26, 2025 02:50 8s renovate/compose.foundation
renovate/compose.foundation
January 26, 2025 02:50 8s
Update dependency androidx.compose.foundation:foundation to v1.7.6 Repo / Label merge conflict #2170: Pull request #1551 synchronize by renovate bot
January 26, 2025 02:49 11s
January 26, 2025 02:49 11s
Update dependency androidx.compose.foundation:foundation to v1.7.6 Repo / Label merge conflict #2169: Commit 8d73cb9 pushed by renovate bot
January 26, 2025 02:49 7s renovate/compose.foundation
renovate/compose.foundation
January 26, 2025 02:49 7s
Update compose.material to v1.7.6 (#1549) Repo / Label merge conflict #2168: Commit ff57e39 pushed by Maxr1998
January 26, 2025 02:49 2m 9s master
master
January 26, 2025 02:49 2m 9s
Update compose to v1.7.6 (#1545) Repo / Label merge conflict #2167: Commit ea5bb4e pushed by Maxr1998
January 26, 2025 02:49 2m 12s master
master
January 26, 2025 02:49 2m 12s
Update android.plugin to v8.8.0 Repo / Label merge conflict #2166: Pull request #1438 synchronize by renovate bot
January 26, 2025 02:24 11s
January 26, 2025 02:24 11s
Update android.plugin to v8.8.0 Repo / Label merge conflict #2165: Commit 8f73854 pushed by renovate bot
January 26, 2025 02:24 8s renovate/android.plugin
renovate/android.plugin
January 26, 2025 02:24 8s
Update dependency androidx.fragment:fragment-ktx to v1.8.5 Repo / Label merge conflict #2164: Pull request #1460 synchronize by renovate bot
January 26, 2025 02:20 9s
January 26, 2025 02:20 9s
Update dependency androidx.fragment:fragment-ktx to v1.8.5 Repo / Label merge conflict #2163: Commit c2a3719 pushed by renovate bot
January 26, 2025 02:20 11s renovate/androidx.fragment
renovate/androidx.fragment
January 26, 2025 02:20 11s
Update dependency com.android.tools:desugar_jdk_libs to v2.1.4 (#1550) Repo / Label merge conflict #2162: Commit 742b01f pushed by Maxr1998
January 26, 2025 02:19 2m 11s master
master
January 26, 2025 02:19 2m 11s
Update junit5 monorepo to v5.11.4 (#1553) Repo / Label merge conflict #2161: Commit d46a744 pushed by Maxr1998
January 26, 2025 02:18 2m 11s master
master
January 26, 2025 02:18 2m 11s
Update dependency androidx.webkit:webkit to v1.12.1 Repo / Label merge conflict #2160: Commit 8993a69 pushed by renovate bot
January 26, 2025 02:16 11s renovate/androidx.webkit
renovate/androidx.webkit
January 26, 2025 02:16 11s
Update dependency androidx.core:core to v1.15.0 Repo / Label merge conflict #2159: Commit bd5e988 pushed by renovate bot
January 26, 2025 02:16 9s renovate/androidx.core
renovate/androidx.core
January 26, 2025 02:16 9s