Skip to content

Actions: sojourn-13/sojourn-station

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
675 workflow run results
675 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Add files via upload (#4817) Check for merge conflicts #1984: Commit d26f299 pushed by cdb-is-not-good
October 24, 2023 10:00 57s master
master
October 24, 2023 10:00 57s
Update origin_synthetic.dm (#4806) Check for merge conflicts #1983: Commit c93535b pushed by cdb-is-not-good
October 24, 2023 09:45 38s master
master
October 24, 2023 09:45 38s
Onlooker fixes, robot-gun buffs and warcrimebots (#4803) Check for merge conflicts #1982: Commit a16bdc8 pushed by cdb-is-not-good
October 24, 2023 09:45 39s master
master
October 24, 2023 09:45 39s
Janibuffs (#4800) Check for merge conflicts #1981: Commit 19e8cb2 pushed by cdb-is-not-good
October 24, 2023 09:44 1m 9s master
master
October 24, 2023 09:44 1m 9s
yet another outsider buff (#4795) Check for merge conflicts #1980: Commit 0c599a4 pushed by cdb-is-not-good
October 17, 2023 04:07 36s master
master
October 17, 2023 04:07 36s
Addon - Excel Fortress (Fixed maybe) (#4792) Check for merge conflicts #1979: Commit 1de2165 pushed by cdb-is-not-good
October 17, 2023 04:07 49s master
master
October 17, 2023 04:07 49s
sprite fix (#4805) Check for merge conflicts #1978: Commit 23eee2a pushed by cdb-is-not-good
October 14, 2023 20:42 51s master
master
October 14, 2023 20:42 51s
Update noticeboard.dm (#4804) Check for merge conflicts #1977: Commit cca75f3 pushed by cdb-is-not-good
October 14, 2023 02:45 52s master
master
October 14, 2023 02:45 52s
Update robot.dm (#4802) Check for merge conflicts #1976: Commit a1e2b3b pushed by cdb-is-not-good
October 13, 2023 19:21 52s master
master
October 13, 2023 19:21 52s
Update toxic_biomass.dm (#4801) Check for merge conflicts #1975: Commit 5c5c1fb pushed by cdb-is-not-good
October 13, 2023 16:13 57s master
master
October 13, 2023 16:13 57s
Gladstone (#4799) Check for merge conflicts #1974: Commit 482a0da pushed by cdb-is-not-good
October 12, 2023 20:05 53s master
master
October 12, 2023 20:05 53s
Another megaPR looming on the horizon (#4797) Check for merge conflicts #1973: Commit f768307 pushed by cdb-is-not-good
October 12, 2023 19:21 50s master
master
October 12, 2023 19:21 50s
Trilby asked me to port this (#4782) Check for merge conflicts #1972: Commit 814a8e1 pushed by cdb-is-not-good
October 12, 2023 16:24 58s master
master
October 12, 2023 16:24 58s
So much for that small PR i was working on. (#4790) Check for merge conflicts #1971: Commit 41f8387 pushed by cdb-is-not-good
October 12, 2023 16:22 51s master
master
October 12, 2023 16:22 51s
Im having trouble holding all these borg icons (#4793) Check for merge conflicts #1970: Commit 39b00cf pushed by cdb-is-not-good
October 12, 2023 01:47 47s master
master
October 12, 2023 01:47 47s
Reverts the DB shotgun sprite to it's pre-fallout glory days. (#4794) Check for merge conflicts #1969: Commit 9cb4559 pushed by cdb-is-not-good
October 12, 2023 01:33 50s master
master
October 12, 2023 01:33 50s
re-adds some guns that were requested (#4781) Check for merge conflicts #1968: Commit 825a1f1 pushed by cdb-is-not-good
October 7, 2023 13:27 54s master
master
October 7, 2023 13:27 54s
CBO buffs (#4776) Check for merge conflicts #1967: Commit 92848de pushed by cdb-is-not-good
October 7, 2023 13:26 50s master
master
October 7, 2023 13:26 50s
This was supposed to be a small PR. (#4777) Check for merge conflicts #1966: Commit 2c346bf pushed by cdb-is-not-good
October 7, 2023 13:26 36s master
master
October 7, 2023 13:26 36s
Creating ERT Ready Room (#4780) Check for merge conflicts #1965: Commit 910eb6a pushed by cdb-is-not-good
October 7, 2023 13:26 1m 2s master
master
October 7, 2023 13:26 1m 2s
should've tested the last bugfix, oh well. (#4789) Check for merge conflicts #1964: Commit 5a4d308 pushed by cdb-is-not-good
October 7, 2023 12:13 51s master
master
October 7, 2023 12:13 51s
some energy shotgun changes. (#4788) Check for merge conflicts #1963: Commit 5bc0d1b pushed by cdb-is-not-good
October 7, 2023 09:13 50s master
master
October 7, 2023 09:13 50s
Buffs marshals for Pneumo. Nerfs marshals for Meeeeeee also some bugf… Check for merge conflicts #1962: Commit c7924a8 pushed by cdb-is-not-good
October 6, 2023 18:51 38s master
master
October 6, 2023 18:51 38s
Add linen bin to Janitor closet, enable linen bin to provide double-s… Check for merge conflicts #1961: Commit c7cfd69 pushed by cdb-is-not-good
October 6, 2023 18:50 54s master
master
October 6, 2023 18:50 54s
postpen for abdicator/Peacekeeper (#4786) Check for merge conflicts #1960: Commit 466d044 pushed by cdb-is-not-good
October 6, 2023 18:48 59s master
master
October 6, 2023 18:48 59s
ProTip! You can narrow down the results and go further in time using created:<2023-10-06 or the other filters available.