Skip to content

Actions: mclaughlinconnor/haxe-ij-merge

Actions

All workflows

Actions

Loading...
Loading

Showing runs from all workflows
30 workflow runs
30 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Add vscode launch json for debugging Deploy demo #33: Commit c84e5b4 pushed by mclaughlinconnor
September 10, 2024 21:11 36s master
master
September 10, 2024 21:11 36s
Trim the trailing newline from getSide Deploy demo #32: Commit b2b2f00 pushed by mclaughlinconnor
September 10, 2024 21:07 38s master
master
September 10, 2024 21:07 38s
Trim the trailing newline from getSide Deploy demo #31: Commit b0a559e pushed by mclaughlinconnor
September 10, 2024 21:06 20s master
master
September 10, 2024 21:06 20s
Make some methods private to stop accidentally using them Deploy demo #30: Commit 672c9ae pushed by mclaughlinconnor
September 8, 2024 22:02 18s master
master
September 8, 2024 22:02 18s
Fix diff rendering calculating the current line incorrectly Deploy demo #29: Commit bbd9b04 pushed by mclaughlinconnor
September 6, 2024 21:55 34s master
master
September 6, 2024 21:55 34s
Return non-zero status code if mergeStrings didn't resolve all conflicts Deploy demo #28: Commit c6617b0 pushed by mclaughlinconnor
September 6, 2024 19:39 43s master
master
September 6, 2024 19:39 43s
Fix pushlineuntil having extra lines Deploy demo #27: Commit 2d31483 pushed by mclaughlinconnor
September 6, 2024 19:33 41s master
master
September 6, 2024 19:33 41s
f Deploy demo #26: Commit d477759 pushed by mclaughlinconnor
September 6, 2024 19:20 44s master
master
September 6, 2024 19:20 44s
d Deploy demo #25: Commit d5017c2 pushed by mclaughlinconnor
September 6, 2024 19:18 32s master
master
September 6, 2024 19:18 32s
Fix pushlineuntil having extra lines Deploy demo #24: Commit c9386bb pushed by mclaughlinconnor
September 6, 2024 19:17 37s master
master
September 6, 2024 19:17 37s
Fix pushlineuntil having extra lines Deploy demo #23: Commit 9c81b9a pushed by mclaughlinconnor
September 6, 2024 19:07 39s master
master
September 6, 2024 19:07 39s
Fix pushlineuntil having extra lines Deploy demo #22: Commit 69ea4f9 pushed by mclaughlinconnor
September 6, 2024 19:03 39s master
master
September 6, 2024 19:03 39s
Fix off-by-one in Myers diff Deploy demo #21: Commit 27338cf pushed by mclaughlinconnor
September 5, 2024 22:35 43s master
master
September 5, 2024 22:35 43s
Remove trailing newline from theirs marker Deploy demo #20: Commit 037efe2 pushed by mclaughlinconnor
September 4, 2024 22:59 32s master
master
September 4, 2024 22:59 32s
Remove trailing newline from theirs marker Deploy demo #19: Commit 4660bf9 pushed by mclaughlinconnor
September 4, 2024 22:57 38s master
master
September 4, 2024 22:57 38s
Remove trailing newline from theirs marker Deploy demo #18: Commit 04d0744 pushed by mclaughlinconnor
September 4, 2024 22:53 33s master
master
September 4, 2024 22:53 33s
Switch default target to JVM Deploy demo #17: Commit bf495e4 pushed by mclaughlinconnor
September 4, 2024 22:39 46s master
master
September 4, 2024 22:39 46s
Switch default target to hashlink Deploy demo #16: Commit 5adabd4 pushed by mclaughlinconnor
September 3, 2024 21:22 21s master
master
September 3, 2024 21:22 21s
Enable optimisation on js builds Deploy demo #15: Commit 61dbc88 pushed by mclaughlinconnor
August 5, 2024 19:03 48s master
master
August 5, 2024 19:03 48s
Add different text highlighting for resolved changes Deploy demo #14: Commit 88e953a pushed by mclaughlinconnor
August 4, 2024 21:39 42s master
master
August 4, 2024 21:39 42s
Adjust diff colours slightly Deploy demo #13: Commit 6f35da2 pushed by mclaughlinconnor
August 4, 2024 21:11 36s master
master
August 4, 2024 21:11 36s
Fix getLineStartOffset failing on the last line of a file Deploy demo #12: Commit 45fc8db pushed by mclaughlinconnor
August 3, 2024 21:24 38s master
master
August 3, 2024 21:24 38s
Update README Deploy demo #11: Commit ba9d6fb pushed by mclaughlinconnor
August 2, 2023 22:20 41s master
master
August 2, 2023 22:20 41s
Add useful information Deploy demo #10: Commit 5eb82cb pushed by mclaughlinconnor
August 2, 2023 22:14 43s master
master
August 2, 2023 22:14 43s
Add mergability message and increase size of files Deploy demo #9: Commit bf310fa pushed by mclaughlinconnor
August 2, 2023 21:52 40s master
master
August 2, 2023 21:52 40s