Skip to content

Actions: yairm210/Unciv

Actions

Conflict marking

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
4,069 workflow runs
4,069 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

ProductionBonusWhenRemoved moddability Conflict marking #9353: Pull request #13072 synchronize by EmperorPinguin
March 17, 2025 08:55 9s
March 17, 2025 08:55 9s
ProductionBonusWhenRemoved moddability Conflict marking #9352: Pull request #13072 synchronize by EmperorPinguin
March 16, 2025 22:32 10s
March 16, 2025 22:32 10s
ProductionBonusWhenRemoved moddability Conflict marking #9351: Pull request #13072 synchronize by EmperorPinguin
March 16, 2025 22:23 7s
March 16, 2025 22:23 7s
ProductionBonusWhenRemoved moddability Conflict marking #9350: Pull request #13072 synchronize by EmperorPinguin
March 16, 2025 22:22 7s
March 16, 2025 22:22 7s
ProductionBonusWhenRemoved moddability Conflict marking #9349: Pull request #13072 synchronize by EmperorPinguin
March 16, 2025 22:13 7s
March 16, 2025 22:13 7s
ProductionBonusWhenRemoved moddability Conflict marking #9348: Pull request #13072 synchronize by EmperorPinguin
March 16, 2025 22:12 6s
March 16, 2025 22:12 6s
ProductionBonusWhenRemoved moddability Conflict marking #9347: Pull request #13072 synchronize by EmperorPinguin
March 16, 2025 22:11 10s
March 16, 2025 22:11 10s
ProductionBonusWhenRemoved moddability Conflict marking #9346: Pull request #13072 synchronize by EmperorPinguin
March 16, 2025 22:10 10s
March 16, 2025 22:10 10s
4.15.17 Conflict marking #9345: Commit df2c1da pushed by yairm210
March 16, 2025 20:48 2m 9s master
master
March 16, 2025 20:48 2m 9s
4.15.17 Conflict marking #9344: Commit df2c1da pushed by yairm210
March 16, 2025 20:48 2m 9s 4.15.17
4.15.17
March 16, 2025 20:48 2m 9s
Version rollout (#13074) Conflict marking #9343: Commit fcce59c pushed by yairm210
March 16, 2025 20:44 2m 7s master
master
March 16, 2025 20:44 2m 7s
Update Indonesian.properties (#13054) Conflict marking #9342: Commit 0bb63af pushed by yairm210
March 16, 2025 20:41 12s version_rollout
version_rollout
March 16, 2025 20:41 12s
translate new line (#13055) Conflict marking #9341: Commit 6e37d07 pushed by yairm210
March 16, 2025 20:41 7s version_rollout
version_rollout
March 16, 2025 20:41 7s
Update Brazilian_Portuguese.properties (#13056) Conflict marking #9340: Commit 1d45be6 pushed by yairm210
March 16, 2025 20:41 7s version_rollout
version_rollout
March 16, 2025 20:41 7s
Update French.properties (#13057) Conflict marking #9339: Commit acb5c4e pushed by yairm210
March 16, 2025 20:41 6s version_rollout
version_rollout
March 16, 2025 20:41 6s
Update Italian.properties (#13059) Conflict marking #9338: Commit e8cd8ab pushed by yairm210
March 16, 2025 20:41 8s version_rollout
version_rollout
March 16, 2025 20:41 8s
Update Latin translation (#13060) Conflict marking #9337: Commit b4509a5 pushed by yairm210
March 16, 2025 20:41 2m 11s version_rollout
version_rollout
March 16, 2025 20:41 2m 11s
Update Spanish.properties (#13065) Conflict marking #9336: Commit 4980550 pushed by yairm210
March 16, 2025 20:41 6s version_rollout
version_rollout
March 16, 2025 20:41 6s
Update German translation (#13067) Conflict marking #9335: Commit 4247949 pushed by yairm210
March 16, 2025 20:41 8s version_rollout
version_rollout
March 16, 2025 20:41 8s
Add Ukrainian translations (#13069) Conflict marking #9334: Commit f421d3c pushed by yairm210
March 16, 2025 20:41 7s version_rollout
version_rollout
March 16, 2025 20:41 7s
Update Dutch.properties (#13073) Conflict marking #9333: Commit d08308b pushed by yairm210
March 16, 2025 20:41 8s version_rollout
version_rollout
March 16, 2025 20:41 8s
Added animation for unit movement button (#13070) Conflict marking #9332: Commit 6d4778e pushed by yairm210
March 16, 2025 20:39 2m 8s master
master
March 16, 2025 20:39 2m 8s
Update MapRegions.kt (#13068) Conflict marking #9331: Commit d2c4fad pushed by yairm210
March 16, 2025 20:39 2m 8s master
master
March 16, 2025 20:39 2m 8s
Update auto save promotions (#13045) Conflict marking #9330: Commit a4464f5 pushed by yairm210
March 16, 2025 20:39 2m 11s master
master
March 16, 2025 20:39 2m 11s
ProductionBonusWhenRemoved moddability Conflict marking #9329: Pull request #13072 synchronize by EmperorPinguin
March 16, 2025 18:53 7s
March 16, 2025 18:53 7s