uuid: - value: 8766d230-d3d4-45fb-82a6-2dbaec0c775b langcode: - value: en type: - target_id: daily_email target_type: node_type target_uuid: 8bde1f2f-eef9-4f2d-ae9c-96921f8193d7 revision_timestamp: - value: '2025-05-11T09:00:18+00:00' revision_uid: - target_type: user target_uuid: b8966985-d4b2-42a7-a319-2e94ccfbb849 revision_log: { } status: - value: true uid: - target_type: user target_uuid: b8966985-d4b2-42a7-a319-2e94ccfbb849 title: - value: "Why I don't branch" created: - value: '2024-02-28T00:00:00+00:00' changed: - value: '2025-05-11T09:00:18+00:00' promote: - value: false sticky: - value: false default_langcode: - value: true revision_translation_affected: - value: true path: - alias: /daily/2024/02/28/why-i-dont-branch langcode: en body: - value: |
A few days ago, I asked why people are still using Git Flow in 2024.
I moved to trunk-based development two years ago and haven't looked back.
Only having a single branch instead of separate main
and develop
branches and branches for each feature and fix is much simpler.
I don't get merge conflicts when trying to merge branches together, as everything is on a single branch.
A couple of years ago, I was working on two features for a project. I was demoing them to a client and broke my local environment when switching branches from feature A to feature B.
It was embarrassing, and it took me time to resolve the issues before I could continue working.
Working mostly on a single branch avoids merge conflicts, saves time, and simplifies my workflow.
No more confusion, merge conflicts or broken demos.
format: full_html processed: |A few days ago, I asked why people are still using Git Flow in 2024.
I moved to trunk-based development two years ago and haven't looked back.
Only having a single branch instead of separate main
and develop
branches and branches for each feature and fix is much simpler.
I don't get merge conflicts when trying to merge branches together, as everything is on a single branch.
A couple of years ago, I was working on two features for a project. I was demoing them to a client and broke my local environment when switching branches from feature A to feature B.
It was embarrassing, and it took me time to resolve the issues before I could continue working.
Working mostly on a single branch avoids merge conflicts, saves time, and simplifies my workflow.
No more confusion, merge conflicts or broken demos.
summary: null field_daily_email_cta: { }