Skip to content

Copier update creates .rej files even when I'm passing --conflict inline #2386

@pauloneves

Description

@pauloneves

Describe the problem

First of all, thanks for the delightful project. I was a cookie cutter heavy user, and can say that this project is miles away.

Now the bug 😊

I'm using copier 10.3 with some custom extension.

Although I'm trying to force --conflicts=inline, copier is still creating .rej files

Here is my command line

    uv run copier update --trust \
      --skip-answered \
      --defaults \
      --skip-tasks \
      --conflict inline --context-lines=3 

Template

sorry, it's my company code and I can't share. I have some tasks like this:

_tasks:
  - command: >
      uv run --project "{{ _copier_conf.src_path }}/copier" --no-dev "{{ _copier_conf.src_path }}/copier/post_devops.py" .copier-answers.yml devops-params.toml
    when: "{{ _copier_operation == 'copy' }}"

_migrations:
  - command: >
      uv run --project "{{ _copier_conf.src_path }}/copier" --no-dev "{{ _copier_conf.src_path }}/copier/post_update_template.py" .copier-answers.yml  devops-params.toml
    when: "{{ exec_post_update and (_stage == 'after') }}"

the scripts are inside a copier subdirectory that is excluded

To Reproduce

cd into the copier directory
run the command

    uv run copier update --trust \
      --skip-answered \
      --defaults \
      --skip-tasks \
      --conflict inline --context-lines=3 

see *.rej files inside the dir

Logs

Expected behavior

I'd like inline conflicts that are good to solve a 3 way merge editor, like the one in vscode

Screenshots/screencasts/logs

No response

Operating system

Linux

Operating system distribution and version

Red Hat Enterprise Linux release 9.3 (Plow)

Copier version

copier 9.10.3

Python version

3.11

Installation method

uvx+git

Additional context

No response

Metadata

Metadata

Assignees

No one assigned

    Labels

    bugtriageTrying to make sure if this is valid or not

    Type

    No type

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions