Project branches -> base -> everything #348
Replies: 4 comments 4 replies
-
|
Updated the title from "Lets talk about it" to "Project branches -> base -> everything" Our previous discussion on this is here: The
|
Beta Was this translation helpful? Give feedback.
-
|
basically "base" is what pull requests should be "based on" :D you see what we did there? currently, we have not had much contribution that wasn't safe to go into both very quickly. when |
Beta Was this translation helpful? Give feedback.
-
|
I appreciate the responses, thanks for the input. Now I'm going to attempt to explain my thoughts with an emphasis on trying to not sound rude or that I'm complaining just to complain. This particular "problem" came up before on the topaz project and I was basically given the same answer. There's basically 2 "main branches" for the project. For this project, now being base and everything. What I'm trying to get at is, I understand that for whatever reason, these branches can't always stay in-sync right away. But if there's something important being pulled into the base branch, such as a fix for something that's broken, that fix needs to be merged into the everything branch as well. Anything else, I'm aware that it will get merged into both branches at some point, relatively soon. For myself, and anyone else running a server based on the everything branch, it's a little frustrating to hear "it'll get updated when someone gets the chance". I'm no expert on github, so I can only assume that when a merge is pulled into one of these two branches, it's just a couple of button clicks away from adding that merge into the other branch. So why the wait? You fix something on one branch, apply it to both. |
Beta Was this translation helpful? Give feedback.
-
yeah but we -are- doing that so I am confused?
As an example I have a day job and if I am with a client guess what, you are waiting till I am free. Its the same for pretty much everybody. But we aren't having huge gaps between these merges from base to everything. I wasn't aware there was a "problem" when I responded, and thought you merely wanted to understand what we were using 2 branches for. Was there something you thought we were taking to long to get into one of the branches? |
Beta Was this translation helpful? Give feedback.
-
|
The fix I wrote was merged up into The git and github stuff is very easy once you get the hang of it. If you don't want to wait for us to merge branches together it's very simple to do it for yourself. |
Beta Was this translation helpful? Give feedback.
-
|
worth noting that its always safe for people who are running |
Beta Was this translation helpful? Give feedback.
-
|
A little late to the conversation, but I always looked at Canaria as a sort of beta environment to "proof" content that may need to be checked before it got committed to the "stable" build, so it typically had the latest confirmed stable content available from the core project plus works in progress. May not be an accurate summary of it, but that would now translate to everything branch being ideally based off the latest presumed stable release (base branch) plus new works in progress? |
Beta Was this translation helpful? Give feedback.
-
|
Yep, though at this time I don't believe there are any feature branches included in everything, as a lot of work has been mainlined into base. |
Beta Was this translation helpful? Give feedback.
-
Ok. So I'm not trying to stir up drama. Just trying to understand, mainly how github works as it pertains to this project. If a pull request is merged into the base branch, how difficult is it to merge that into the everything branch?
Beta Was this translation helpful? Give feedback.
All reactions