branching models, trunk based development

the only good git presentations are VISUAL - unless you visualize what happens in terms of commits, there is NO WAY you can learn.


here they explain very well the meaning of -no-ff (no fast forward)

git merge --no-ff myfeature

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

"The --no-ff flag causes the merge to always create a new commit object, even if the merge could be performed with a fast-forward. This avoids losing information about the historical existence of a feature branch and groups together all commits that together added the feature. "

interesting the explanation of Feature branches, Release branches, Hotfix branches


Here great explanation of merge vs rebase https://git-scm.com/book/en/v2/Git-Branching-Rebasing



https://jenkins-x.io/about/accelerate/


Really interesting what they say here:

https://trunkbaseddevelopment.com/