search

talensgj / jwst

Python library for science observations from the James Webb Space Telescope
https://jwst-pipeline.readthedocs.io/en/latest/
Other
1 stars 0 forks source link

Debug rebase #24

Closed AntoineDarveau closed 2 years ago

AntoineDarveau commented 2 years ago

Re-did the rebase in the correct direction :p

njcuk9999 commented 2 years ago

Can you explain what you mean by "in the right direction"? And why are there now unresolved conflicts for stuff we haven't touched:


Conflicting files
CHANGES.rst
README.md
jwst/cube_build/cube_build_step.py
jwst/cube_build/ifu_cube.py
jwst/cube_build/src/blot_median.c
jwst/cube_build/src/cube_match_internal.c
jwst/cube_build/src/cube_utils.c
jwst/extract_1d/soss_extract/soss_extract.py       # this is the only one we've touched
setup.py