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

Create branches for Godot versions #24

Closed
BastiaanOlij opened this issue Jun 22, 2018 · 2 comments
Closed

Create branches for Godot versions #24

BastiaanOlij opened this issue Jun 22, 2018 · 2 comments

Comments

@BastiaanOlij
Copy link
Collaborator

I suggest we start creating branches to support different versions of Godot.
Say the current master is branched as "3.0.4" and master is brought up to the current 3.1 master.
That way we can keep master up to date with any changes applied to the Godot master repo.
If 3.0.5 or later get any changes to the header we can simply branch the 3.0.4 branch. Obviously we should only create branches for official godot release that actually have changes in the headers.

Especially for those of us who use submodule this works brilliantly because the repos are linked to specific commits so you can keep branches of GDNative modules for 3.0.x linked to the 3.0.x branch and the latest version linked to whatever commit on master that relates to your godot build.

I also suggest doing the same with godot-cpp

@BastiaanOlij
Copy link
Collaborator Author

BastiaanOlij commented Jul 25, 2018

I've created a 3.0 branch on an earlier commit, looks like various changes were already added to master that came out of the 3.1 branch. I'm cloning Godot 3.0 atm so I can do a comparison and see if there are any other changes required

I'll also update the readme over the weekend to explain the need for branches.

@BastiaanOlij
Copy link
Collaborator Author

Once #27 and #28 are merged I think we have a stable split where none of the 3.1 changes are in the 3.0 branch and we have an up to date master.

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

1 participant