Skip to content

Actions: discordia-space/CEV-Eris

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
186 workflow runs
186 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Update redirector.dm (#8513) Check for merge conflicts #1599: Commit cd4a0e9 pushed by TheShown911
August 16, 2024 12:00 1m 3s master
master
August 16, 2024 12:00 1m 3s
resprited breaching hammer (#8511) Check for merge conflicts #1598: Commit cb42bb1 pushed by TheShown911
August 16, 2024 11:59 51s master
master
August 16, 2024 11:59 51s
[COMMISSION] New mech weapons: club, bow & BFG (#8486) Check for merge conflicts #1597: Commit 423c6bf pushed by Humonitarian
August 9, 2024 18:14 51s master
master
August 9, 2024 18:14 51s
Update eotp.dm (#8505) Check for merge conflicts #1596: Commit f43f232 pushed by TheShown911
August 9, 2024 16:46 30s master
master
August 9, 2024 16:46 30s
Update group.dm (#8506) Check for merge conflicts #1595: Commit 7d81fc9 pushed by TheShown911
August 9, 2024 16:46 1m 0s master
master
August 9, 2024 16:46 1m 0s
Update group.dm (#8507) Check for merge conflicts #1594: Commit 90123a9 pushed by TheShown911
August 9, 2024 16:44 30s master
master
August 9, 2024 16:44 30s
Fixes SSchunks duplication cases (Stairs , Fallingoff) (#8508) Check for merge conflicts #1593: Commit 3912249 pushed by TheShown911
August 9, 2024 16:43 55s master
master
August 9, 2024 16:43 55s
Update utility.dm (#8501) Check for merge conflicts #1592: Commit 833211b pushed by TheShown911
July 19, 2024 16:26 15s master
master
July 19, 2024 16:26 15s
New Posters + map edit (#8502) Check for merge conflicts #1591: Commit 26902fd pushed by TheShown911
July 19, 2024 16:24 16s master
master
July 19, 2024 16:24 16s
First bach of new eris posters (#8500) Check for merge conflicts #1590: Commit 9bbfa37 pushed by TheShown911
July 5, 2024 14:11 38s master
master
July 5, 2024 14:11 38s
Update some TGUI dependencies (#8499) Check for merge conflicts #1589: Commit d30f3b2 pushed by TheShown911
July 5, 2024 14:02 35s master
master
July 5, 2024 14:02 35s
Add "Fix air" proc (#8498) Check for merge conflicts #1588: Commit 0b99cfc pushed by TheShown911
July 5, 2024 13:59 27s master
master
July 5, 2024 13:59 27s
Distant star (#8497) Check for merge conflicts #1587: Commit 1680a33 pushed by TheShown911
July 5, 2024 13:59 1m 3s master
master
July 5, 2024 13:59 1m 3s
Add sushis (#8496) Check for merge conflicts #1586: Commit 6337366 pushed by TheShown911
June 28, 2024 19:15 1m 9s master
master
June 28, 2024 19:15 1m 9s
Adds being visibly insane, lowborn or noble. (#8493) Check for merge conflicts #1585: Commit fd04209 pushed by TheShown911
June 21, 2024 17:30 39s master
master
June 21, 2024 17:30 39s
recent issues laundry list (#8495) Check for merge conflicts #1584: Commit 3eaca32 pushed by TheShown911
June 21, 2024 17:26 51s master
master
June 21, 2024 17:26 51s
Walls 2: Electric Boogaloo (#8482) Check for merge conflicts #1583: Commit bbaa70f pushed by TheShown911
June 14, 2024 17:18 37s master
master
June 14, 2024 17:18 37s
AME bugfixes, taxes, and QoL change (#8487) Check for merge conflicts #1582: Commit a8318e6 pushed by TheShown911
June 4, 2024 10:51 50s master
master
June 4, 2024 10:51 50s
makes the math storyteller does actually useful (#8491) Check for merge conflicts #1581: Commit 6fe2328 pushed by TheShown911
May 31, 2024 16:36 56s master
master
May 31, 2024 16:36 56s
this might even fix changelogs (#8490) Check for merge conflicts #1580: Commit bc7bf6e pushed by TheShown911
May 31, 2024 16:33 55s master
master
May 31, 2024 16:33 55s
Barricades (#8468) Check for merge conflicts #1579: Commit d44357f pushed by Firefox13
May 17, 2024 20:30 37s master
master
May 17, 2024 20:30 37s
fix snacks.dm runtime (#8485) Check for merge conflicts #1578: Commit 6e47144 pushed by Firefox13
May 17, 2024 20:30 27s master
master
May 17, 2024 20:30 27s
BYOND 515 compatibility (#8484) Check for merge conflicts #1577: Commit e5a4b28 pushed by Firefox13
May 17, 2024 20:30 42s master
master
May 17, 2024 20:30 42s
Revert "chaos level now automatically increases hourly (#8488)" (#8489) Check for merge conflicts #1576: Commit c2bc832 pushed by Humonitarian
May 17, 2024 19:20 41s master
master
May 17, 2024 19:20 41s
chaos level now automatically increases hourly (#8488) Check for merge conflicts #1575: Commit f256022 pushed by Humonitarian
May 15, 2024 09:04 41s master
master
May 15, 2024 09:04 41s