Skip to content

Actions: jbeilstenedmands/xia2

Actions

identify merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Improve batch scale method to avoid copy identify merge conflicts #129: Commit 949360e pushed by jbeilstenedmands
April 8, 2024 13:52 10s batch_scale
batch_scale
April 8, 2024 13:52 10s
Rename debug record identify merge conflicts #128: Commit 2b290e0 pushed by jbeilstenedmands
April 8, 2024 13:18 10s batch_scale
batch_scale
April 8, 2024 13:18 10s
Reindex for single batch too identify merge conflicts #127: Commit 6d3265c pushed by jbeilstenedmands
April 8, 2024 13:06 13s batch_scale
batch_scale
April 8, 2024 13:06 13s
Plumb back in identify merge conflicts #126: Commit dc1a03f pushed by jbeilstenedmands
April 8, 2024 09:49 11s batch_scale
batch_scale
April 8, 2024 09:49 11s
Update identify merge conflicts #125: Commit 3c32787 pushed by jbeilstenedmands
April 5, 2024 11:06 11s 784_bugfix
784_bugfix
April 5, 2024 11:06 11s
Manually rename identify merge conflicts #124: Commit b91eb11 pushed by jbeilstenedmands
April 5, 2024 11:05 13s 784_bugfix
784_bugfix
April 5, 2024 11:05 13s
Fix recently introduced issue identify merge conflicts #123: Commit 6f1a503 pushed by jbeilstenedmands
April 5, 2024 10:59 11s 784_bugfix
784_bugfix
April 5, 2024 10:59 11s
Set space group identify merge conflicts #122: Commit c96cad1 pushed by jbeilstenedmands
April 5, 2024 09:38 11s cosym_ssx_ref
cosym_ssx_ref
April 5, 2024 09:38 11s
Add news identify merge conflicts #121: Commit a16603b pushed by jbeilstenedmands
April 5, 2024 08:15 11s maintain_batch_order
maintain_batch_order
April 5, 2024 08:15 11s
Guarantee consistent ordering of batches through reduction identify merge conflicts #120: Commit 4320449 pushed by jbeilstenedmands
April 4, 2024 12:48 12s maintain_batch_order
maintain_batch_order
April 4, 2024 12:48 12s
Updating batch_cosym method identify merge conflicts #119: Commit 3abdaa9 pushed by jbeilstenedmands
April 4, 2024 08:45 10s cosym_ssx_ref
cosym_ssx_ref
April 4, 2024 08:45 10s
Add user guide for new clustering options identify merge conflicts #118: Commit c92339e pushed by jbeilstenedmands
March 27, 2024 12:31 14s add_multiplex_guide
add_multiplex_guide
March 27, 2024 12:31 14s
Update multiplex test to be more stable. (#773) identify merge conflicts #117: Commit d30da35 pushed by jbeilstenedmands
February 21, 2024 09:15 11s main
main
February 21, 2024 09:15 11s
Merge remote-tracking branch 'origin/main' into ssx_isigma_filter identify merge conflicts #116: Commit 8ce7358 pushed by jbeilstenedmands
February 21, 2024 09:12 11s ssx_isigma_filter
ssx_isigma_filter
February 21, 2024 09:12 11s
Rename newsfragments/XXX.feature to newsfragments/762.feature identify merge conflicts #115: Commit 92fdda6 pushed by DiamondLightSource-build-server
August 31, 2023 14:51 15s ssx_isigma_filter
ssx_isigma_filter
August 31, 2023 14:51 15s
Add test, rename parameter identify merge conflicts #114: Commit 16418ce pushed by jbeilstenedmands
August 31, 2023 14:44 15s ssx_isigma_filter
ssx_isigma_filter
August 31, 2023 14:44 15s
Remove log call identify merge conflicts #113: Commit 8e31ec9 pushed by jbeilstenedmands
August 31, 2023 13:47 16s ssx_isigma_filter
ssx_isigma_filter
August 31, 2023 13:47 16s
Add optional I/sigma filter to xia2.ssx_reduce identify merge conflicts #112: Commit 1b7dbfa pushed by jbeilstenedmands
August 31, 2023 13:43 11s ssx_isigma_filter
ssx_isigma_filter
August 31, 2023 13:43 11s
Rename newsfragments/XXX.feature to newsfragments/761.feature identify merge conflicts #111: Commit 4804188 pushed by DiamondLightSource-build-server
August 18, 2023 16:01 9s restructure_ssxreduce_pt1
restructure_ssxreduce_pt1
August 18, 2023 16:01 9s
Add news identify merge conflicts #110: Commit 3a2f48d pushed by jbeilstenedmands
August 18, 2023 16:00 9s restructure_ssxreduce_pt1
restructure_ssxreduce_pt1
August 18, 2023 16:00 9s
Remove unneeded functions identify merge conflicts #109: Commit 707fba9 pushed by jbeilstenedmands
August 18, 2023 15:56 10s restructure_ssxreduce_pt1
restructure_ssxreduce_pt1
August 18, 2023 15:56 10s
Bugfix identify merge conflicts #108: Commit 507ded0 pushed by jbeilstenedmands
August 18, 2023 15:50 11s restructure_ssxreduce_pt1
restructure_ssxreduce_pt1
August 18, 2023 15:50 11s
Allow scale on batch objects identify merge conflicts #107: Commit c1fcb33 pushed by jbeilstenedmands
August 17, 2023 13:06 13s restructure_ssxreduce_pt1
restructure_ssxreduce_pt1
August 17, 2023 13:06 13s
Don't try to be clever identify merge conflicts #106: Commit 9150a30 pushed by jbeilstenedmands
August 15, 2023 13:52 11s restructure_data_reduction
restructure_data_reduction
August 15, 2023 13:52 11s
Add option to skip file validation identify merge conflicts #105: Commit f91bf5d pushed by jbeilstenedmands
August 15, 2023 13:10 11s restructure_data_reduction
restructure_data_reduction
August 15, 2023 13:10 11s