Skip to content

master -> main #953

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

Merged
merged 3 commits into from
Nov 30, 2021
Merged

master -> main #953

merged 3 commits into from
Nov 30, 2021

Conversation

leios
Copy link
Member

@leios leios commented Nov 29, 2021

I think the only thing we needed to change was deploy.yml, but I took the opportunity to also remove old travis infrastructure

@leios leios requested a review from ntindle November 29, 2021 13:13
Copy link
Member

@ntindle ntindle left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM overall, keep in mind you will need to be quick about it running and we may need to merge another PR right after to trigger the deployments since when this is merged the main branch wont exist

Comment on lines -1 to -2
# Domain coloring

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Contex on removal?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There were 2 *.bak files that were not meant to be committed. It was due to a temporary state in aspell for spell-checking I think

Comment on lines -3 to -4
Flood fill is a method that is surprisingly useful in a large number of different situations and keeps finding me wherever I go.
When I was completing my PhD, I had an idea to track superfluid vortices by using flood fill as a way to help mask out unnecessary features of the simulation.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Context on removal?

Co-authored-by: Dimitri Belopopsky <ShadowMitia@users.noreply.github.com>
@leios
Copy link
Member Author

leios commented Nov 30, 2021

Ok, so to be clear, the best thing to do is:

  1. Change the name to main
  2. Merge this
  3. update another PR to make sure the CI builds
  4. If that branch works, then update all PRs?

@Amaras
Copy link
Member

Amaras commented Nov 30, 2021

If the branch is renamed successfully, all open PRs targets will be updated automatically as well.

@leios leios merged commit 93d4a17 into algorithm-archivists:main Nov 30, 2021
@leios leios deleted the main_swap branch December 2, 2021 16:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants