<@UB2EH889X> implemented the merge driver change w...
# atmos-devj
Jorrit Elfferich
08/11/2026, 5:28 PM@Erik Osterman (Cloud Posse) implemented the merge driver change we discussed: github.com/cloudposse/atmos/pull/2925
👍 1
Jorrit Elfferich
08/11/2026, 5:32 PMYikes, too fast. Resolving those comments ..
e
Erik Osterman (Cloud Posse)
08/11/2026, 5:43 PMYes, coderabbit is relentless 😉
j
Jorrit Elfferich
08/11/2026, 6:48 PMIt is... 😮💨. Got it's seal now though..
Also picked up your comment on the blog post, if you have some time later 🙏
👍 1
Jorrit Elfferich
08/12/2026, 5:42 AMHey @Erik Osterman (Cloud Posse), seems the MacOS acc tests failed but doesn't seem to be at all related to the changes 🤔. I see it failing in other branches too?
e
Erik Osterman (Cloud Posse)
08/12/2026, 1:47 PMLooks like in my branch too
Erik Osterman (Cloud Posse)
08/12/2026, 1:48 PMWill take a look
j
Jorrit Elfferich
08/12/2026, 1:48 PM👍 LMK if I can help from my end
e
Erik Osterman (Cloud Posse)
08/12/2026, 1:49 PMCleanShot 2026-08-12 at 08.49.06@2x.png
💀 1
Erik Osterman (Cloud Posse)
08/12/2026, 1:49 PMfortunately that's in 10 minutes
Erik Osterman (Cloud Posse)
08/12/2026, 2:16 PMOk, it's related to concurency issues using the macOS trust store.
Erik Osterman (Cloud Posse)
08/12/2026, 2:16 PMWe have simialr fix for linux/windows, but not on mac. Will fix.
j
Jorrit Elfferich
08/12/2026, 2:17 PMcool, lmk when I need to rebase or do anything otherwise 👍
e
Erik Osterman (Cloud Posse)
08/12/2026, 2:47 PM(lol, I thought today was thursday)
j
Jorrit Elfferich
08/12/2026, 2:50 PM🫥
Jorrit Elfferich
08/12/2026, 2:50 PMhaha I completely read over that tbh
2 Views