Before merging in patches, we merged move_to_mth5 into patches. This was slightly complicated due to ipynbs changing. A git merge got a little messy, so we reverted to the last good commits of patches and move_to_mth5 and did this:
Patches well behaved pre-merge is: 8988ff5c24fa005d4b5a4533f3cdccee37c61cc0\
move_to_mth5 well beahved before merge d94bc18
forked d94bc18 to a branch named merging
on merging, checked out the 4 conflict ipynbs from patches, and committed.
merged merging into patches.
Then manually fixed notebooks and committed on patches.
When the smoke cleared, there were a few files that didn't seem to have merged as desired -- it is not clear why, at least a few of these were worked on quite recently. The files were:
Before merging in patches, we merged
move_to_mth5into patches. This was slightly complicated due to ipynbs changing. A git merge got a little messy, so we reverted to the last good commits of patches and move_to_mth5 and did this:mergingmerging, checked out the 4 conflict ipynbs from patches, and committed.mergingintopatches.Then manually fixed notebooks and committed on
patches.When the smoke cleared, there were a few files that didn't seem to have merged as desired -- it is not clear why, at least a few of these were worked on quite recently. The files were:
test_process_parkfield_run.py test_process_parkfield_run_rr.py test_fourier_coefficients.py test_multi_run.py test_processing.py
Minor changes were applied to these, taking the latest, correct code from both branches.