search

astropy / ccd-reduction-and-photometry-guide

Read the CCD guide here:
http://www.astropy.org/ccd-reduction-and-photometry-guide/
BSD 3-Clause "New" or "Revised" License
101 stars 46 forks source link

Implements the correction proposed in #355. #356

Closed jogojapan closed 10 months ago

jogojapan commented 10 months ago

As described in the issue.

mwcraig commented 10 months ago

Thanks for opening this @jogojapan and for reporting the issue. It looks like the commit history has gotten somewhat scrambled. I think you should be able to fix that by following these steps in the folder you have the git clone of the repository in:

# add the official repo as a remote
git remote add upstream https://github.com/astropy/ccd-reduction-and-photometry-guide.git

# Get information about the main branch in the official repo
git fetch upstream main

# Make a new branch from the most recent commit on upstream main
git checkout -b fix-355 6abf2e667b437e449475f35aae29732729f0d4b0

# Copy just the commit with your change
git cherry-pick 238e7938d4ff905596ce05a298d1ba0f62ce01d4

Once you have done this, push the new branch to your fork and open a new PR that uses that branch.

jogojapan commented 10 months ago

I apologize! It didn't look as bad when I submitted it...

I meanwhile had to do some clean-up on some of the branches in my fork. It must have affected the PR. I followed your advice and created a new PR: https://github.com/astropy/ccd-reduction-and-photometry-guide/pull/357

jogojapan commented 10 months ago

Closing this one as invalid.