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

Ctd plot #110

Closed
wants to merge 6 commits into from
Closed

Ctd plot #110

wants to merge 6 commits into from

Conversation

FloraSauerbronn
Copy link
Contributor

Adding new function in to plotting.py

@ocefpaf
Copy link
Member

ocefpaf commented Jun 25, 2024

@FloraSauerbronn as expected we have some conflicts here. We can either rebase this one and deal with the conflicts, or re-send this PR. The latter is easier and I'd like to avoid diving into merge conflicts at this stage of GSoC.

Do you mind closing this one and re-do this PR from a fresh branch upstream/main branch? To get a fresh upstream main branch you will need to:

  1. git fetch upstream # fetch the latest changes from upstream
  2. git checkout upstream/main -b ctd_plots # checks upstream/main into a new feature branch named ctd_plots (you can change that name)

Then you are all set to copy the changes from this PR over and re-send it from the conflict free ctd_plots.

@ocefpaf
Copy link
Member

ocefpaf commented Jun 28, 2024

@FloraSauerbronn does #115 supersedes this one? If so, can we close this one?

@FloraSauerbronn
Copy link
Contributor Author

This PR is supersedes by #115

@FloraSauerbronn FloraSauerbronn deleted the ctd-plot branch August 30, 2024 19:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants