git branches merging

Hi All,
apologie me but I’m not very familiar with git… I see there’re are a lot of branches and I ask myself when understand a branches is merged to the main dev.
Is it disappeared when is merged?
When a branche is created… is it its main code freezed and the new code is updated only?

I hope to been clear :slightly_smiling_face:

Cheers
Gabriele

A feature branch gets merged into dev once we consider it to be stable enough.

Branches do not disappear unless we delete them. Branches typically get deleted once they’re merged, unless there is more work to be done on them. A branch can be merged multiple times.

Code in dev never freezes. Once we consider dev stable enough for a release, we merge dev into a new branch release-x.y.z, and once that’s been tested, it gets merged into releases and then tagged. The tag is the new stable release.

See http://nvie.com/posts/a-successful-git-branching-model/

1 Like

Hi Morgan,
when I said " it its main code freezed" I meant the dev code which is into the branch…
What i mean is: is the code part which is not changed by the branch developer syncroned with the main master??

Not automatically synched up, the branch’s management team has to pull from the changes in the main code (dev in RawTherapee) when desired.

I don’t understand what you’re asking.

https://git-scm.com/book

https://learngitbranching.js.org/

OK, I have to study…

Cheers
Gabriele

Very good model… I just took me 4 months to have it adopted in a recent project (and even longer to make some folks understand the beauty of git rebase).