djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix merge-translate by starting with 'theirs'

Browse Source
This commit is contained in:
Scott Shawcroft 2020-05-29 10:17:42 -07:00
parent 7ea95457ee
commit 0e6813d084
No known key found for this signature in database
GPG Key ID: 9349BC7E64B1921E
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -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)