opdavies/oliverdavies.uk
1
0
Fork 0
Code Issues 1 Pull requests Projects 1 Releases Packages Wiki Activity Actions

Use four spaces in frontmatter blocks

Browse source
This commit is contained in:
Oliver Davies 2024-02-07 20:01:19 +00:00
parent f3756a80a6
commit 11ae0f9fc7
422 changed files with 2980 additions and 2986 deletions
Download patch file Download diff file Expand all files Collapse all files

8
source/_daily_emails/2023-06-17.md
View file

@ -1,12 +1,12 @@
---
title: >
Avoid Git merge hell with trunk-based development
Avoid Git merge hell with trunk-based development
pubDate: 2023-06-17
permalink: >-
archive/2023/06/17/avoid-git-merge-hell-with-trunk-based-development
archive/2023/06/17/avoid-git-merge-hell-with-trunk-based-development
tags:
- git
- trunk-based-development
- git
- trunk-based-development
---
Regardless of whether I was working as part of a team or individually, I used to create a new branch for every change. I'd do the work and merge the feature branch back into the mainline branch - usually either `main` or `develop`.