From 8a42c33dca577e827e31a212f2db6de1428ebc95 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft <scott@tannewt.org>
Date: Wed, 20 May 2020 10:49:01 -0700
Subject: Add top level merge-translate target

---
 Makefile | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Makefile b/Makefile
index 842c18da5..b64217596 100644
--- a/Makefile
+++ b/Makefile
@@ -210,6 +210,12 @@ locale/circuitpython.pot: all-source
 translate: locale/circuitpython.pot
 	for po in $(shell ls locale/*.po); do msgmerge -U $$po -s --no-fuzzy-matching --add-location=file locale/circuitpython.pot; done
 
+merge-translate:
+	git merge HEAD 1>&2 2> /dev/null; test $$? -eq 128
+	rm locale/*~ || true
+	git checkout --ours -- locale/*
+	make translate
+
 check-translate: locale/circuitpython.pot $(wildcard locale/*.po)
 	$(PYTHON) tools/check_translations.py $^
 
-- 
cgit v1.2.3