Merge Conflict 78: This One is Actually Good
Merge Conflict1 Jan 2018

Merge Conflict 78: This One is Actually Good

Happy 2018! We made it, so let's recap the best in tech, development, life, coffee, and so much more that happened in 2017. We expose our top picks of the year and of course what we are looking forward to in 2018.

Follow Us

Episoder(508)

500: How Frank Builds Apps Has Changed Forever

500: How Frank Builds Apps Has Changed Forever

On our 500th episode James and Frank celebrate the milestone, reminisce about their mobile‑dev roots, and dig into how AI, the Copilot CLI/SDK and the Model Context Protocol (MCP) are reshaping workfl...

2 Feb 54min

499: Going Full Ralph, CLI, & GitHub Copilot SDK?!?!

499: Going Full Ralph, CLI, & GitHub Copilot SDK?!?!

In episode 499 James and Frank dive into the messy, exciting world of coding agents — from burning through Copilot credits and avoiding merge conflicts to practical workflows for letting agents run ta...

26 Jan 48min

498: CI/CD fro Mac Apps: GitHub Actions to Notarize

498: CI/CD fro Mac Apps: GitHub Actions to Notarize

This episode opens with mic and Nintendo banter before plunging into macOS release pain points: sandboxing, hardened runtime, notarization, Sparkle auto‑updates, and automating releases with GitHub Ac...

19 Jan 38min

497: Turning Machine Code into C with AI

497: Turning Machine Code into C with AI

In this episode James and Frank dive into the practical realities of using AI in everyday development—arguing that AI shines in brownfield (existing) code because it respects your architecture, while ...

12 Jan 51min

496: All The Holiday Hacks

496: All The Holiday Hacks

Follow Us Frank: Twitter, Blog, GitHub James: Twitter, Blog, GitHub Merge Conflict: Twitter, Facebook, Website, Chat on Discord Music : Amethyst Seer - Citrine by Adventureface ⭐⭐ Review Us ⭐⭐ ...

5 Jan 1h 12min

495: 2025 Wrapped - The Official Year of AI Development

495: 2025 Wrapped - The Official Year of AI Development

James and Frank unwrap 2025 as the Year of AI Development, covering new models, the rise of agents, and editor integrations like Copilot in VS Code that changed how developers write and maintain code....

29 Des 20251h 24min

494: TV Evolution- CRTs, Aspect Ratios, and Beyond

494: TV Evolution- CRTs, Aspect Ratios, and Beyond

Dive into the fascinating world of CRT technology in this episode of How CRTs Work! Discover how these iconic monitors influenced video playback and gaming, from interlaced scanning to the art of sync...

22 Des 202530min

493: Git's most powerful but underutilized tool

493: Git's most powerful but underutilized tool

In this episode of 'Merge Conflict,' James and Frank dive into the intricacies of Git work trees, exploring how they revolutionize local machine development by allowing developers to manage multiple b...

15 Des 202555min

Populært innen Politikk og nyheter

giver-og-gjengen-vg
aftenpodden
aftenpodden-usa
i-retten
forklart
popradet
fotballpodden-2
rss-gukild-johaug
dine-penger-pengeradet
stopp-verden
nokon-ma-ga
det-store-bildet
bt-dokumentar-2
hanna-de-heldige
rss-penger-polser-og-politikk
chit-chat-med-helle
frokostshowet-pa-p5
aftenbla-bla
e24-podden
rss-dannet-uten-piano