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

games-roguelike/cataclysm-dda: added a dev branch USE #82

Merged
merged 1 commit into from
Mar 9, 2020

Conversation

l29ah
Copy link
Contributor

@l29ah l29ah commented Mar 6, 2020

@leycec
Copy link
Owner

leycec commented Mar 9, 2020

Cataclysmic. Thanks for the excellent wintertime volunteerism – as always, @l29ah.

Ordinarily, I'd prefer to unconditionally switch the EGIT_BRANCH from master to dev rather than add another USE flag. That said, @ZhilkinSerg's commentary does suggest that the new dev branch might just be a temporary placeholder that will go away after the 0.E release. If so, then adding another USE flag is actually the Right Thing To Do.™

In short, time will tell. I'm delighted to merge this as is and grateful for your keen eye. Let's keep an eye on upstream, though. If unstable feature development ends up permanently moving over to the new dev branch, we'll probably want to:

  1. Revert this commit.
  2. Unconditionally switch the EGIT_BRANCH from master to dev.

Thanks again, @l29ah. You're awesomeness!

@leycec leycec merged commit fdb46fc into leycec:master Mar 9, 2020
@KorGgenT
Copy link

as a developer of C:DDA i'll confirm that it is temporary and the dev branch will be merged to master after the 0.E stable release

@ZhilkinSerg
Copy link

FYI: We started to make hotfix releases for stable versions:

It is not necessary that each and every stable release in the future will have such hotfix, but it is highly likely.

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