I'm curious about this too - looking at the github repo, it seems like there's a mix of pulls into staging and into master. The git flow section of
https://genode.org/documentation/genode-foundations-24-05.pdf is a little ambigious - it mentions staging as being the place to put untested changes and then requests that topic branches be pulled from the most current genodelabs/master.
@Jack: I am in no way affiliated with the Genode team, so I don't claim to speak for them, but I think it is unlikely that they will choose to convert their README files to markdown as they are currently using a homebrew formatting tool
https://github.com/nfeske/gosh which has a few more features including compiling to LaTeX.
Sorry, I believe I misread the Genode Contributors guide. Genode does not use pull requests, they copy commits that are referenced within issues? So I should make an issue in the repository, then reference my commit against it and genode will copy that into their repository?
Should I use the master branch for my development in this case and reference my commits to the issues from my master branch?
On Mon, 15 Jul 2024, at 14:38, Jack Curran wrote:
Hello, I have made some pull requests. I have just updated some readme files to markdown format. As far as I understand pull requests are a request to introduce/upload my changes to the Genode repository. This is my first time ever using/learning git, so I am not very familiar with how it works. I see that there are two branches in the genode repository, Master and Staging. Staging seems to be the most active branch where new changes are being introduced before an official release?
Is the master branch supposed to be a copy of the latest public release and is only updated every time a full public release is announced? Staging seems to be the active development branch. So I made my pull request to that branch. Although I am not sure which branch I am supposed to make pull requests to? The genode contributions page says to make pull requests to the master branch.
> As a rule of thumb, every line of development should have a corresponding issue in the issue tracker.
> This will be the place where we will discuss your ongoing work. If there is no issue for your topic, please create one.
> Once there exists the issue with a short description about what your line of work is about, create a new topic branch based on the genodelabs/master branch.
_______________________________________________
_______________________________________________