Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removing COmplexVID as it is no longer in use. #373

Closed
wants to merge 2 commits into from

Conversation

sabinala
Copy link
Contributor

Deleted three files adapted from the original COmplex-VID code, and the notebook that used them (for scenario 3 in hackathon prep).

@review-notebook-app
Copy link

Check out this pull request on  ReviewNB

See visual diffs & provide feedback on Jupyter Notebooks.


Powered by ReviewNB

@sabinala sabinala self-assigned this Sep 12, 2023
@sabinala sabinala added the awaiting review PR submitter awaiting code review from reviewer label Sep 12, 2023
@SamWitty SamWitty requested review from SamWitty and removed request for djinnome and JosephCottam October 10, 2023 19:31
@SamWitty
Copy link
Contributor

@sabinala , could you please resolve the merge conflicts?

@sabinala
Copy link
Contributor Author

@SamWitty I would love to, but I'm not sure how to. When I try merging the sa-delete-complexvid branch, I get this:

(base) WE47357:pyciemss altu809$ git fetch origin
(base) WE47357:pyciemss altu809$ git pull origin sa-delete-complexvid
From https://github.com/ciemss/pyciemss
 * branch            sa-delete-complexvid -> FETCH_HEAD
Already up to date.
(base) WE47357:pyciemss altu809$ git merge sa-delete-complexvid
Already up to date.
(base) WE47357:pyciemss altu809$ git status
On branch sa-delete-complexvid
Your branch is up to date with 'origin/sa-delete-complexvid'.

nothing to commit, working tree clean

But I was expecting git status to give me a list of conflicting files? All I am trying to do is delete those three files listed.

@SamWitty
Copy link
Contributor

Try git pull origin main

:Q

q
q:
exit
stop
@sabinala
Copy link
Contributor Author

Thanks, I think we're good to go.

@SamWitty
Copy link
Contributor

Closing, as it's superseded by #396

@SamWitty SamWitty closed this Oct 26, 2023
@sabinala sabinala deleted the sa-delete-complexvid branch February 21, 2024 21:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
awaiting review PR submitter awaiting code review from reviewer
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants