Hello Cédric, sorry for the delay in response, In internal Zikzakmedia team, we are working about the two option: merge branch. When realease a Tryton version (every 6 months), we create a new branch. The name about new branch is "version" realesed. Default branch continue development and when some feature/bug is commit in default branch, we merge to "version" branch.
About development, depend the module (about repo origin module) we use codereview tool or we fork the repo (local or in Bitbutcket), create developments in this new repo, and finally, merge to main repo. My experience about fork repos in Bitbucket or Github is when forks are growing repos and finally is chaos. You not know what is "main" repo. We don't have acces in hg.tryton.org. We need to add patch in bugs.tryton.org (previous we do codereview) and you apply this commit/patch in develop branch. I think is your decision how to work and apply patch in main repo and older versions repos. IMHO, I expend some time and mistakes working about codereview and bugs tryton tools. I think this part we need to documentated more better. For newbie users Thanks to insist about this topic Raimon
