On May 23, 2021, at 2:43 PM, chuck c <bubbas...@gmail.com> wrote: > There are currently three active branches: > (https://gitlab.com/wireshark/wireshark/-/branches/active) > master, master-3.2 and release-3.4 > > My merge requests are to "master". > If appropriate, it also gets backported > (https://www.wireshark.org/docs/wsdg_html/#ChSrcBackport) to master-3.2 > and/or release-3.4. > > Soon (for some value of "soon") there will be a 3.6 branch. > How do commits get from "master" (dev branch) to a stable branch?
The stable branch "branches" off from the main branch at some point; all changes in the main branch up to that point are all automatically in the stable branch as well. After that, all changes to the main branch would have to be backported to the stable branch if they are to be in the stable branch. > Will all of the commits in "master" make it to "release-3.6"? All of the ones made before the branch point will automatically be in release-3.6; bug-fix changes made after that should (in the imperative sense) be backported to release-3.6, and most, hopefully, will. ___________________________________________________________________________ Sent via: Wireshark-dev mailing list <wireshark-dev@wireshark.org> Archives: https://www.wireshark.org/lists/wireshark-dev Unsubscribe: https://www.wireshark.org/mailman/options/wireshark-dev mailto:wireshark-dev-requ...@wireshark.org?subject=unsubscribe
