From 0e6813d084233580774eb7dc043f54999998c223 Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Fri, 29 May 2020 10:17:42 -0700 Subject: [PATCH] Fix merge-translate by starting with 'theirs' --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b642175969..f6146bfe48 100644 --- a/Makefile +++ b/Makefile @@ -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)