diff options
| author | Jeff Epler <jeff@adafruit.com> | 2020-05-29 13:21:04 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-29 13:21:04 -0500 |
| commit | 5cd6bb4d56385843229b4503c983e7586c8104fd (patch) | |
| tree | b9b3929a8eb6bd07f773e2623738092419ddae0d | |
| parent | 4667d4de8c52c74a57afda3d48f10bc00bc43bfe (diff) | |
| parent | 0e6813d084233580774eb7dc043f54999998c223 (diff) | |
Merge pull request #2978 from tannewt/fix_merge_translate
Fix merge-translate by starting with 'theirs'
| -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) |