Have another one for review, scaffold again (what ...
# atmos-dev
j
Have another one for review, scaffold again (what else 🤓) github.com/cloudposse/atmos/pull/3236
I somehow got it right the first time, the 🐰 agrees without additional iterations 😇
a
you are getting better and better at taming the 🐰 we'll review today
j
To be quite honest its a minimal change 😅 Also am anticipating maybe some feedback on it. The way diff conflict % right now is calculated is a bit weird, but I didn't change that yet. Maybe we should, but keen on what you folks think.
The TL;DR is that conflict diff % can be > 100... which feels... weird? But it has been like this since inception of scaffold, I did not change it, but maybe we should. I am a bit indifferent about it atm.
I fixed the Windows test. Classic "every line changed" due to line endings different... This was actually broken since introducing the
rendered
update strategy. Fixed it by normalizing everything before heading into 3-way merge and restoring original
ours
line-endings after.
👀 1
Fixed the latest 🐰 finding.
👀 1