Fix merge conflicts on uv migration tasks

Running the migration task to move to uv caused nasty merge conflicts.
I reported this upstream[1], which showed the workaround used here.
Eventually, we'll get a proper solution[2], but for now, "git add"

[1]: https://github.com/orgs/copier-org/discussions/2612
[2]: copier-org/copier#2376

Author: OverkillGuy

CHANGELOG.md

@@ -10,6 +10,12 @@ templating versions are not perfect matches for semantic versions.
 
 - Support for python 3.14, changing default version to 3.13
 
+### Fixed
+
+- Running the uv migration task no longer causes nasty merge conflicts. 
+  Using [a workaround](https://github.com/orgs/copier-org/discussions/2612#discussioncomment-16544812),
+  awaiting proper solution upstream ([draft PR](https://github.com/copier-org/copier/pull/2376))
+
 ## v2.0.0a26 - 2026-04-12
 
 ### Added

copier.yml

@@ -6,13 +6,7 @@ _skip_if_exists:
   - CHANGELOG.md
   - README.md
   - docs/source/index.md
-  # pyproject.toml is updated via migration task = excluded
-  # But only in updates from v1 to v2 = migration poetry -> uv
-# FIXME: Refine the filter for excluding pyproject.toml ONLY on update AND when moving from v1 to v2 of template (other cases should be empty)
-  - "{% if _copier_operation == 'update' -%}pyproject.toml{% endif %}"
-
-# and _copier_answers._commit.startswith('v1')
-# # Tasks (git init + commit + tag) interfere with the update process!
+# NOTE: Tasks (git init + commit + tag) interfere with the update process!
 _tasks:
   - when: "{{ _copier_operation == 'copy' }}"
     command: >-
@@ -23,8 +17,10 @@ _tasks:
       {{_copier_conf.src_path}}/hooks/git_init_project
 _migrations:
   - version: v2.0.0a8
-    command: cat pyproject.toml && uvx migrate-to-uv && uv lock && cat pyproject.toml
+    # HACK: "Git add" avoids https://github.com/orgs/copier-org/discussions/2612#discussioncomment-16544812
+    command: uvx migrate-to-uv && uv lock && git add pyproject.toml uv.lock
     when: "{{ _stage == 'before' }}"
+
 project_name:
   type: str
   help: "What is your project name? (format: Capitalized With Spaces)"