diff --git a/web/Weblate-server.qmd b/web/Weblate-server.qmd index 0d8dee9..b251ae3 100644 --- a/web/Weblate-server.qmd +++ b/web/Weblate-server.qmd @@ -238,21 +238,26 @@ Weblate will provide a suggestion on how to fix, but in short: git svn rebase ``` -6. Optionally, you might need to install [helpers](https://github.com/JulienPalard/po3way) to make it easier to deal with the git conflicts (inside Docker): +6. Optionally, if not yet done, install [helpers](https://github.com/JulienPalard/po3way) to make it easier to deal with the git conflicts (inside Docker). Start Docker as root to install `po3way` system-wide: ```sh - pip install po3way + $ sudo docker exec -u root -ti weblate-docker_weblate_1 bash ``` - Then add `/home/weblate/.local/bin` to `$PATH` or symlink it, e.g. starting Docker as root: + Then in the Docker container: + ```sh + # pip install --prefix /usr/local po3way + # exit + ``` + + To set up `git` to always use `po3way`, first start the Docker container using the regular user: ```sh - $ sudo docker exec -u root -ti weblate-docker_weblate_1 bash - # ln -s /home/weblate/.local/bin/po3way /bin/po3way + $ sudo docker exec -ti weblate-docker_weblate_1 bash ``` - With the regular `weblate` user (i.e., no longer as `root`) inside Docker, edit `.git/config` inside `app/data/vcs/r-project/base-r-gui` to add: + And edit `.git/config` at `app/data/vcs/r-project/base-r-gui` to add the below content: ```sh [merge "po3way"]