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

Why is stable-v2 ahead of master branch? #458

Closed
Innixma opened this issue Mar 24, 2022 · 4 comments
Closed

Why is stable-v2 ahead of master branch? #458

Innixma opened this issue Mar 24, 2022 · 4 comments
Assignees

Comments

@Innixma
Copy link
Collaborator

Innixma commented Mar 24, 2022

"This branch is 27 commits ahead, 13 commits behind master."

stable-v2 includes nice improvements like #433

Yet this is not present in master branch. Is there a plan to have master branch be up to date? Ideally I'd assume that master branch would always be ahead or equal to any stable branch.

@PGijsbers
Copy link
Collaborator

Patches in stable-v2 will be merged into master. stable-v2 is supposed to be frozen for consistency in the experiments we ran, but we required certain fixes to run our experiments.

@PGijsbers
Copy link
Collaborator

@sebhrusen I have no strong opinion on how to apply those patches back into master, but I've got a feeling you do :) would you be willing to take care of this?

@sebhrusen
Copy link
Collaborator

I started to work on #416 a few weeks ago to fix the versioning workflow which currently prevents us from merging changes in stable branches back to master automatically.
I'll try to work back on this soon.

@sebhrusen
Copy link
Collaborator

sebhrusen commented Jun 28, 2022

will be solved by #416

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

3 participants