search

trimble-oss / devguide

Trimble's development guidelines
https://devguide.trimble.com
MIT License
6 stars 10 forks source link

Git Standards recommends the Gitflow workflow #54

Open coliff opened 2 years ago

coliff commented 2 years ago

https://devguide.trimble.com/development-practices/vcs-standards-git/

The Git Standards page on our site currently suggests to use the Gitflow workflow - however the link to more info says that it is no longer recommended.

I think we could consider changing this to suggest using Trunk-based development instead as it:

it streamlines merging and integration phases, it helps achieve CI/CD and increases software delivery and organizational performance.

matthew-dexter-trimble commented 2 years ago

Seems a reasonable change to me I guess - might be useful to know what kind of workflows are being followed elsewhere in Trimble - MEP is probably somewhere between gitflow and trunk-based - we have just moved our CI/CD to trigger deployment from tag creation which I don't think is really part of either workflow.

kuhnboy commented 2 years ago

Many projects within Trimble that I've worked on wouldn't be able to do trunk-based development because of how they operate. There aren't many projects that are in a mature / modern enough place where they can do continuous deployment which is the reason to migrate from gitflow to trunk-based development. I think we should recognize them both.

jeffdoolittle commented 2 years ago

Agreed, we need to provide guidance around options. I would add that in my experience trunk based development works best when used together with forking rather than having a bunch of branches littering up the primary repository.