Skip to content

Actions: jbeilstenedmands/xia2

Actions

identify merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
merge-conflicts.yml
43 workflow runs
43 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Update the documentation! identify merge conflicts #154: Commit 7c5af82 pushed by jbeilstenedmands
October 21, 2024 13:58 11s multiplex_selected_clusters
multiplex_selected_clusters
October 21, 2024 13:58 11s
Add type hints and expand tests for cluster_analysis identify merge conflicts #153: Commit 7c34e6a pushed by jbeilstenedmands
October 21, 2024 13:29 12s multiplex_selected_clusters
multiplex_selected_clusters
October 21, 2024 13:29 12s
Add min multiplicity etc filtering options to coordinate clustering identify merge conflicts #152: Commit ddcada2 pushed by jbeilstenedmands
October 21, 2024 09:55 15s multiplex_selected_clusters
multiplex_selected_clusters
October 21, 2024 09:55 15s
Add tests for new options identify merge conflicts #151: Commit f031b71 pushed by jbeilstenedmands
October 21, 2024 08:50 15s multiplex_selected_clusters
multiplex_selected_clusters
October 21, 2024 08:50 15s
Add missing new file, fix a few issues identify merge conflicts #150: Commit 6e0d9f3 pushed by jbeilstenedmands
October 18, 2024 15:11 17s multiplex_selected_clusters
multiplex_selected_clusters
October 18, 2024 15:11 17s
Do coordinate clustering in multiplex identify merge conflicts #149: Commit 16ec971 pushed by jbeilstenedmands
October 18, 2024 14:58 17s multiplex_selected_clusters
multiplex_selected_clusters
October 18, 2024 14:58 17s
Reformat cluster_analysis identify merge conflicts #148: Commit 79224fd pushed by jbeilstenedmands
October 18, 2024 11:38 20s multiplex_selected_clusters
multiplex_selected_clusters
October 18, 2024 11:38 20s
Update test identify merge conflicts #147: Commit 7b18b18 pushed by jbeilstenedmands
October 16, 2024 11:20 10s multiplex_selected_clusters
multiplex_selected_clusters
October 16, 2024 11:20 10s
Rename newsfragments/xxx.feature to newsfragments/783.feature identify merge conflicts #146: Commit 3eaf222 pushed by jbeilstenedmands
October 16, 2024 10:48 11s multiplex_selected_clusters
multiplex_selected_clusters
October 16, 2024 10:48 11s
Merge branch 'main' into ssx_isigma_filter identify merge conflicts #145: Commit 801e644 pushed by ndevenish
October 15, 2024 07:47 11s ssx_isigma_filter
ssx_isigma_filter
October 15, 2024 07:47 11s
Correlation changes identify merge conflicts #144: Commit 22762e6 pushed by jbeilstenedmands
September 25, 2024 10:04 12s multiplex_selected_clusters
multiplex_selected_clusters
September 25, 2024 10:04 12s
removing testing identify merge conflicts #143: Commit 983a8a2 pushed by jbeilstenedmands
September 25, 2024 09:56 15s multiplex_selected_clusters
multiplex_selected_clusters
September 25, 2024 09:56 15s
Merge branch 'main' into ssx_isigma_filter identify merge conflicts #142: Commit 19d993f pushed by ndevenish
August 19, 2024 11:00 12s ssx_isigma_filter
ssx_isigma_filter
August 19, 2024 11:00 12s
Merge remote-tracking branch 'origin/main' into ssx_isigma_filter identify merge conflicts #141: Commit 2337fc2 pushed by ndevenish
August 19, 2024 10:48 10s ssx_isigma_filter
ssx_isigma_filter
August 19, 2024 10:48 10s
Rename newsfragments/XXX.bugfix to newsfragments/801.bugfix identify merge conflicts #140: Commit d74e048 pushed by DiamondLightSource-build-server
July 26, 2024 15:24 10s no_spots_in_res_bin_fail
no_spots_in_res_bin_fail
July 26, 2024 15:24 10s
Add news identify merge conflicts #139: Commit 7411849 pushed by jbeilstenedmands
July 26, 2024 14:56 15s no_spots_in_res_bin_fail
no_spots_in_res_bin_fail
July 26, 2024 14:56 15s
Catch error if empty bins, reduce nbins identify merge conflicts #138: Commit 8621f76 pushed by jbeilstenedmands
July 26, 2024 13:23 10s no_spots_in_res_bin_fail
no_spots_in_res_bin_fail
July 26, 2024 13:23 10s
Rename newsfragments/XXX.bugfix to newsfragments/798.bugfix identify merge conflicts #137: Commit 64c298d pushed by DiamondLightSource-build-server
June 28, 2024 08:07 14s fix_ssx_reindex
fix_ssx_reindex
June 28, 2024 08:07 14s
Correctly set space group name after reindexing in ssx reduce batch c… identify merge conflicts #136: Commit 6802065 pushed by jbeilstenedmands
June 27, 2024 13:44 15s fix_ssx_reindex
fix_ssx_reindex
June 27, 2024 13:44 15s
Update tests identify merge conflicts #135: Commit 184efb4 pushed by jbeilstenedmands
June 5, 2024 15:56 12s batch_scale
batch_scale
June 5, 2024 15:56 12s
Remove batch_scale file identify merge conflicts #134: Commit 1863e6f pushed by jbeilstenedmands
June 5, 2024 12:55 14s batch_scale
batch_scale
June 5, 2024 12:55 14s
Update cosym options identify merge conflicts #133: Commit 2b81e8f pushed by jbeilstenedmands
May 7, 2024 09:44 11s batch_scale
batch_scale
May 7, 2024 09:44 11s
Renaming, bugfix identify merge conflicts #132: Commit ef78a47 pushed by jbeilstenedmands
April 10, 2024 12:15 12s batch_scale
batch_scale
April 10, 2024 12:15 12s
More adjustments identify merge conflicts #131: Commit 2ff4d5a pushed by jbeilstenedmands
April 9, 2024 15:46 10s batch_scale
batch_scale
April 9, 2024 15:46 10s
Set more scale parameters, remove unnecessary loads identify merge conflicts #130: Commit 106eb1d pushed by jbeilstenedmands
April 9, 2024 13:44 12s batch_scale
batch_scale
April 9, 2024 13:44 12s