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

Taxel: Change default branch to be main #162

Closed
glensc opened this issue Apr 4, 2021 · 9 comments
Closed

Taxel: Change default branch to be main #162

glensc opened this issue Apr 4, 2021 · 9 comments
Assignees

Comments

@glensc
Copy link
Collaborator

glensc commented Apr 4, 2021

Problem: Requirement to have 1 review, slows down project development.

Solution: Use a different branch than master for development.

  • EDIT[2021-03-25]: Decided to switch to git-flow model, where changes go to develop and releases from master branch: Switch to use git flow development model #160
  • EDIT[2021-04-04]: will go with simple main for now, as I'm doing changes alone here.
  • EDIT[2021-04-12]: set default branch to 0.7.x, 0.6.x (aka main) should be merged here: Merge up 0.6.x to master #209
  • EDIT[2021-04-17]: set default branch to be main

refs:

@Taxel please update project settings to reflect new changes.

@Taxel
Copy link
Owner

Taxel commented Apr 17, 2021

@glensc I disabled the branch protection for master and switched the default branch to 0.7.x. Would it make more sense to merge 0.7.x into main and using that as the default branch?

@glensc
Copy link
Collaborator Author

glensc commented Apr 17, 2021

@Taxel hello! :)

I've made a mess here during your absence, so let me provide a plan on how to proceed.

@glensc
Copy link
Collaborator Author

glensc commented Apr 17, 2021

I actually like the two branch mechanism here, provides some kind of stability and developer releases procedure.

so, right now:

  1. merge main -> master: Merge up 0.6.x to master #209 this is known as 0.6.x branch @glensc
  2. re-create main from merged master @glensc
  3. set default branch to be main @Taxel
  4. merge 0.7.x -> main: Merge up 0.7.x to main #248, this is known as 0.7.x branch @glensc
  5. create branches 0.6.x, 0.7.x from their last state. they will be left for bugfixes only @glensc

altho I prefer merging to 0.8.x and one new version start merging to 0.9.x branch, but this procedure would require to update default branch from time to time. it's tedious and requires owner permission in the repository, which I don't have.

and next steps:

  1. create a branch from main for 0.8.x development, make new developments go there.
  2. delete master branch
  3. create 0.5.x for maintenance @glensc

time to time when development is complete, create merge up pull request (like #209, #248):

  1. create a merge request to merge 0.8.x to main
  2. merge 0.8.x merge up merge request
  3. create a new branch 0.9.x from main

EDIT: Edited for clarity and added checkboxes

@glensc
Copy link
Collaborator Author

glensc commented Apr 17, 2021

@Taxel wdyt? is it clear? if no objections I will proceed with the "right now" items.

@glensc
Copy link
Collaborator Author

glensc commented Apr 17, 2021

@Taxel I realized that the plan has a conflict with the current default branch (0.7.x), github may do something funny, for example close all pull requests.

so, I'll merge #209, and you set the default branch back to main, but not before #209 is merged.

EDIT: #209 is merged

@glensc glensc changed the title Taxel: Change default branch to be 0.7.x Taxel: Change default branch to be main Apr 17, 2021
@glensc
Copy link
Collaborator Author

glensc commented Apr 17, 2021

@Taxel merged #209, can you set the default branch to be main now, so could proceed with this plan:

sorry for the mess. I'm trying to figure out myself too how this should work :)

@glensc
Copy link
Collaborator Author

glensc commented Apr 17, 2021

And as I guessed, GitHub still did something funny. when #209 was merged, all other PR's merging to main were closed as the main branch was deleted:

@Taxel
Copy link
Owner

Taxel commented Apr 17, 2021

@glensc default branch is now main.

@glensc
Copy link
Collaborator Author

glensc commented Apr 17, 2021

All done!

I guess should update documentation, re-opened PR for that:

@glensc glensc closed this as completed Apr 17, 2021
Repository owner locked as resolved and limited conversation to collaborators Jan 11, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants