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

Merge pull request #2978 from tannewt/fix_merge_translate

Browse Source 
Fix merge-translate by starting with 'theirs'
This commit is contained in:
Jeff Epler 2020-05-29 13:21:04 -05:00 committed by GitHub
commit 5cd6bb4d56
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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)