Branching and Version Control

Howetuft — Mon, 05 Oct 2026 03:43:09 GMT

Strategy

← Older revision		Revision as of 05:43, 5 October 2026
(4 intermediate revisions by the same user not shown)
Line 2:		Line 2:


	~~= Preliminary considerations =~~

	~~A few considerations should be kept in mind:~~
	* We are a very small core team. Branch strategy should be light and agile.
	* However, we also want a frame structured enough to avoid git pitfalls (merge conflicts and so on), in which we can welcome occasional contributors and, why not, some other core developers.
	* Our needs vary depending on whether we are in feature development phases or release and stabilization phases.
	* Our availability for LuxCore varies, which means that some development tasks may take time (and the related development branches may remain active for a long time) as we are busy elsewhere. To the contrary, when we are available, we should not be hampered by excessive admin tasks (git configuration and so on).
	* We are also dependent from other environments: in particular, we deploy on PyPi, where releases are immutable

	= Strategy =		= General Strategy =

	Our strategy is inspired by <i>Trunk-Based Development</i> (TBD), as described here: https://trunkbaseddevelopment.com/.		Our strategy is inspired by <i>Trunk-Based Development</i> (TBD), as described here: https://trunkbaseddevelopment.com/.

	We rely on <b>a <code>main</code> branch, always stable, always releasable.</b> This branch is "the Single Source of Truth" where all development happens.
			We rely on <b>a <code>main</code> branch, always stable, always releasable.</b>


			This <code>main</code> branch is <b>"the Single Source of Truth" where all development happens.</b>


	<pre>		<pre>
Line 29:		Line 27:
	* LuxCore		* LuxCore
	* BlendLuxCore		* BlendLuxCore

			= Details =

	== Main branch ==		== Main branch ==
Line 113:		Line 113:
	* In PR (and push): run minimal tests (buildability & simple runtime tests) to ensure stability and releasability are kept.		* In PR (and push): run minimal tests (buildability & simple runtime tests) to ensure stability and releasability are kept.
	* In a weekly build: run extensive tests to ensure non-regression.		* In a weekly build: run extensive tests to ensure non-regression.

			= Appendices =

			== Appendix A: A few considerations that oriented our choice ==

			* We are a very small core team. Branch strategy should be light and agile.
			* However, we also want a frame structured enough to avoid git pitfalls (merge conflicts and so on), in which we can welcome occasional contributors and, why not, some other core developers.
			* Our needs vary depending on whether we are in feature development phases or release and stabilization phases.
			* Our availability for LuxCore varies, which means that some development tasks may take time (and the related development branches may remain active for a long time) as we are busy elsewhere. To the contrary, when we are available, we should not be hampered by excessive admin tasks (git configuration and so on).
			* We are also dependent from other environments: in particular, we deploy on PyPi, where releases are immutable

LuxCoreRender Wiki - Recent changes [en]

Branching and Version Control