2019-04-12 08:31:37 +00:00
|
|
|
#!/bin/bash
|
|
|
|
|
|
|
|
git checkout l10n_master
|
2020-02-16 14:35:19 +00:00
|
|
|
git reset --hard HEAD~50
|
2020-02-16 12:49:24 +00:00
|
|
|
git pull origin l10n_master
|
|
|
|
rm -rf /tmp/translationfiles ; cp -r ../translationfiles /tmp
|
|
|
|
rm -rf /tmp/descriptions ; mkdir /tmp/descriptions ; cp -r ./descriptions/[a-z][a-z]_[A-Z][A-Z] /tmp/descriptions/
|
2019-04-12 08:31:37 +00:00
|
|
|
git checkout master
|
2020-02-16 12:49:24 +00:00
|
|
|
cp -r /tmp/translationfiles ../
|
|
|
|
cp -r /tmp/descriptions ./
|
|
|
|
git commit -a -m "new translations from crowdin"
|
|
|
|
|
|
|
|
#git checkout l10n_master
|
|
|
|
#git reset --hard HEAD~200
|
|
|
|
#git pull http l10n_master
|
|
|
|
#git rebase master
|
|
|
|
#git reset --soft master
|
|
|
|
#git commit -m "new translations from crowdin"
|
|
|
|
#git checkout master
|
|
|
|
#git merge l10n_master
|
2019-04-12 08:45:51 +00:00
|
|
|
echo "MERGE DONE"
|