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

Restructuring Branches #156

Closed
Davidutro opened this issue Jan 21, 2021 · 5 comments
Closed

Restructuring Branches #156

Davidutro opened this issue Jan 21, 2021 · 5 comments
Assignees
Labels
enhancement New feature or request

Comments

@Davidutro
Copy link
Contributor

Davidutro commented Jan 21, 2021

Problem:
Lots of Branches, lots of overhead to keep them straight, crappy UX for mip authors, etc

Solution:
Eliminate all but the master branch.

Discussion points:

  • What does the process look like with one branch?
  • ??? add more if you think of any

@CPSTL

@Davidutro Davidutro added the enhancement New feature or request label Jan 21, 2021
@Davidutro
Copy link
Contributor Author

Davidutro commented Jan 21, 2021

Re: process

  1. MIP authors create a PR at the beginning of RFC as usual, except it's for the master.
  2. They perform the updates to the MIP as it passes through RFC there, making active updates to the PR.
  3. PR is merged upon approved status

Does this sound reasonable? I am coming at this with totally fresh eyes, so lmk what you think @CPSTL

@Davidutro
Copy link
Contributor Author

During the 02/02/21 governance domain meeting, Juan, LFW, and Prose all agreed that we can move ahead with deleting the unneeded branches and sticking purely to master and RFC for now. With the plan being to deprecate RFC as well, just having people push to master

@Davidutro
Copy link
Contributor Author

Davidutro commented Feb 2, 2021

Problem:
One thing that worries me is dealing with amendments without an RFC branch.
If everything gets pushed to master then approved mips get messed up until the MIP amendments are accepted or rejected.

Solution:
The MIP4c2 would be added to master while the amendments would be submitted as a separate PR, that would be merged when accepted. - LFW

@Davidutro
Copy link
Contributor Author

I deleted all but the master and RFC branches.

I think we will delete the RFC branch soon as well, just want to think about the process a bit to make sure there isn't anything we're overlooking.

@Davidutro
Copy link
Contributor Author

This project is done, all branches are gone beside master

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

No branches or pull requests

2 participants