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

Merge progresses on different branches and clean up #18

Open
VietAnh1010 opened this issue Dec 18, 2024 · 3 comments
Open

Merge progresses on different branches and clean up #18

VietAnh1010 opened this issue Dec 18, 2024 · 3 comments

Comments

@VietAnh1010
Copy link
Collaborator

We have different implementations on some branches. Let's merge them and clean up the repo.

TODO:

  • Which are those branches?
  • Add tests to detect bugs when we merge the branches
  • Fix bugs
@dariusf
Copy link
Collaborator

dariusf commented Dec 19, 2024

The active branches:

  • evaluation: higher-order
  • StagedSL: effects
  • reset_shift: based on StagedSL
  • sleek: new work on using Sleek, based on evaluation

Here's what I think should be the best way to integrate everything.

  • Start with evaluation, as tests should already be somewhat working there
  • Make a new master branch based on evaluation, which will be the new default branch of the repo
  • Merge StagedSL into master, get tests working
  • Merge reset_shift into master, get tests working
  • sleek is easy to merge and can be done at any time

@dariusf
Copy link
Collaborator

dariusf commented Dec 19, 2024

I have set up a new master branch based off evaluation, with tests working, and all the changes from the previously-open PRs integrated. It's not yet the default and the CI is also not working yet.

@VietAnh1010
Copy link
Collaborator Author

StagedSL is merged, there is a bug that causes a test to loop.

Let's continue by merging reset_shift into master. We can then fix the bugs and enable CI.

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

No branches or pull requests

2 participants