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

Feature request: What is up with my branches?! #4

Closed
pastthepixels opened this issue Jul 7, 2022 · 2 comments
Closed

Feature request: What is up with my branches?! #4

pastthepixels opened this issue Jul 7, 2022 · 2 comments
Labels
enhancement New feature or request help wanted Extra attention is needed

Comments

@pastthepixels
Copy link
Owner

Is your feature request related to a problem? Please describe.
I'm a bit concerned with how I'm working with branches in InfiniteShooter. Here's the thing:

  • I want to have something for each stable release, like 0.4.x, where bug fixes happen.
  • I also want to have a branch for 0.5.0, where I can start adding new features.
    But how do I make sure that bug fixes for the game apply to both 0.5.0 (dev) and 0.4.x (0.4.x)?

Describe the solution you'd like
I... actually have no idea. That's mainly why I'm asking--if I knew how to make something, and have it be sustainable, I would do so in a heartbeat.

Describe alternatives you've considered
Something like what Godot's doing? But unfortunately I didn't really see any solutions to my issue in their repository/docs.

@pastthepixels pastthepixels added enhancement New feature or request help wanted Extra attention is needed labels Jul 7, 2022
@pastthepixels
Copy link
Owner Author

pastthepixels commented Jul 16, 2022

I just found out that creating new releases of InfiniteShooter also makes tags which can be viewed like a branch, so there's no need to leave branches for older versions of InfiniteShooter.
My plan is probably therefore gonna be to delete branches 0.2.0 and 0.3.0, rename 0.4.x to stable or main, and rename dev to feature-additions or something to highlight that it's only supposed to be for changes to InfiniteShooter that add major features. (All bugfixes/code optimization and such thus would be in stable, which I would then make the main branch).
Edit: Should probably add that I still don't know what to do should I want to have code refactoring, but if it makes the game more stable/doesn't make it unstable I can probably just do it on the main branch.

@pastthepixels
Copy link
Owner Author

Okay, I think I have more organized branches now. Closing this for now

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request help wanted Extra attention is needed
Projects
None yet
Development

No branches or pull requests

1 participant