Trunk-based development workshop

Trunk-based development workshop was a hands-on session for computer-science students at Chiang Mai University on 25 January 2025. Teams of three practised trunk-based development: everyone commits small changes to one shared main branch instead of keeping long-lived branches.

How it ran

1. Member A forks the starter repository and invites B and C as collaborators.
2. Everyone clones it.
3. Each member works on their own small Python module (greeting functions and simple operations) and integrates into the main branch often, resolving conflicts as they arise.

Exercises and resources come with the repository. It ran through the CSCMU66 on GitHub organisation.

See also

• Git conflict workshop
• Teaching and community