diff options
| author | Scott Shawcroft <scott@tannewt.org> | 2020-05-29 10:17:42 -0700 |
|---|---|---|
| committer | Scott Shawcroft <scott@tannewt.org> | 2020-05-29 10:17:42 -0700 |
| commit | 0e6813d084233580774eb7dc043f54999998c223 (patch) | |
| tree | 63f76efaf9abd56ba4048dbf014c0411c1ad8f3f /Makefile | |
| parent | 7ea95457eeb67fcaccfa911a4d979fa642262da5 (diff) | |
Fix merge-translate by starting with 'theirs'
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -213,7 +213,7 @@ translate: locale/circuitpython.pot merge-translate: git merge HEAD 1>&2 2> /dev/null; test $$? -eq 128 rm locale/*~ || true - git checkout --ours -- locale/* + git checkout --theirs -- locale/* make translate check-translate: locale/circuitpython.pot $(wildcard locale/*.po) |