3 way merge driver usage

[burner1024]

Describe the issue

Hi.
I've been looking for ways to reduce merge conflicts.
This issue and this file came up.
I can't find any documentation about it.
The comment in the file says that it's installed for all weblate internal repositories. What are "internal repositories"? Just Weblate's local copies of upstream, or something else? I checked git config in weblate container, and the setting is not there.

Is it already used in my installation, and I just don't know about it? Or it specifically needs to be enabled? If so, can it be enabled globally for all repos?

I already tried

• I've read and searched the documentation.
• I've searched for similar issues in this repository.

Steps to reproduce the behavior

Expected behavior

No response

Screenshots

No response

Exception traceback

No response

How do you run Weblate?

Docker container

Weblate versions

No response

Weblate deploy checks

No response

Additional context

No response

[github-actions]

This issue looks more like a support question than an issue. We strive to answer these reasonably fast, but purchasing the support subscription is not only more responsible and faster for your business but also makes Weblate stronger.

In case your question is already answered, making a donation is the right way to say thank you!

[nijel]

It is installed in DATA_DIR/home/.config/git/attributes and DATA_DIR/home/.gitconfig, see https://docs.weblate.org/en/latest/admin/config.html#std-setting-DATA_DIR

[burner1024]

So, it is used by default for all repos, and no additional configuration is required?

Because if I change dir to an actual repo and check settings, it's not there:

weblate@7c82e9374077:/app/data/vcs/fallout/up$ git config --list | grep merge
branch.master.merge=refs/heads/master

[nijel]

Yes, it is used. All commands in Weblate are executed with HOME=DATA_DIR/home.

[burner1024]

I see, thank you for the explanation!

[github-actions]

The issue you have reported is now resolved. If you don’t feel it’s right, please follow its labels to get a clue for further steps.

• In case you see a similar problem, please open a separate issue.
• If you are happy with the outcome, don’t hesitate to support Weblate by making a donation.