News for hackers. Stuff that matters.
Re:Phorge: Going Public by SergeAx on Sunday September 18, 2022 @02:37AM (#32885021)
When we develop software task by task, feature by feature, some (actually, most) features are too big to be represented by a single commit. This is because we need code versions history to understand those changes in the future, even if the author is not around, and wrapping my head around +5000/-3000 diff is very complex task by itself. On the other hand, in most CD systems pushing commit to master branch triggers a new version deploy. So we are doing small atomic "always green" changes in a separate branch, and then merge them all at once into master branch.
Re:Phorge: Going Public by redsaz on Sunday September 18, 2022 @02:24PM (#32890007)
Has your team considered using feature flags? For large changes that can span weeks of effort, being able to PR and get small portions in to main branch and then "flip the switch" at the end usually works out better for us than "okay our feature branch is done but now we have to catch it back up to everything that happened in the meantime from the past few weeks."
Re:Phorge: Going Public by SergeAx on Sunday September 18, 2022 @03:53PM (#32890889)
We are thinking about it. There are still some gray zones like database migrations. It is easier to daily rebase big feature branches onto master, IMO.