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

Change to two spaces

Browse source
This commit is contained in:
Oliver Davies 2024-09-08 23:09:54 +01:00
parent 2537fe2052
commit ed60ab964c
556 changed files with 2252 additions and 2252 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`.