
============================================================
Diff summary
============================================================

New files (1 total — will be added by apply):
  + docker-compose.yml

Conflicting files (1 total — your changes vs. new render):
  ! .env


============================================================
Conflict: .env
============================================================

--- {{FROM_DIR}}/.env  (your current file)
+++ {{TO_DIR}}/.env  (new render)

--- current/.env
+++ new-render/.env
@@ -1,3 +1,3 @@
 PUBLIC_URL=avatar.example.com
 ENV_NAME=production
-OLD_SETTING=this_line_will_be_removed
+NEW_SETTING=this_line_was_added
✓   .env: will use new render.

✓ All conflicts resolved — apply may proceed.
