我有分支和所有在該分支的變化是在主人(頭)。但git diff master...feature/5492_new_currency
告訴我,它不是。我錯在哪裏?爲什麼分支報告沒有合併,儘管它合併
$ git diff master...feature/5492_new_currency
diff --git a/app/locale/ru/LC_MESSAGES/lang.po b/app/locale/ru/LC_MESSAGES/lang.po
index 9274c9e..6b9d1ae 100644
--- a/app/locale/ru/LC_MESSAGES/lang.po
+++ b/app/locale/ru/LC_MESSAGES/lang.po
@@ -4531,6 +4531,10 @@ msgstr "$"
msgid "currency:UZS"
msgstr "сум."
+# Британский фунт
+msgid "currency:GBP"
+msgstr "£"
+
msgid "datepicker:prevText"
msgstr "Пред>"
diff --git a/app/protos/defaults.ini b/app/protos/defaults.ini
index 4742982..4de9ea3 100644
--- a/app/protos/defaults.ini
+++ b/app/protos/defaults.ini
@@ -2,8 +2,8 @@ BASE_DOMAIN = xxxxx
INSTANCE_COUNTRY = ru
INSTANCE_LANGS = ru en
DEFAULT_LANGUAGE = ru
-# Доступные валюты стран для магазинов: РФ, США, Евро, Казахстан, Украина, Китай, Молдова, Армения,
-INSTANCE_CURRENCY = RUB USD EUR KZT UAH CNY MDL AMD UZS AZN KGS TJS TMT GEL LVL LTL
+# Доступные валюты стран для магазинов: РФ, США, Евро, Казахстан, Украина, Китай, Молдова, Армения,
+INSTANCE_CURRENCY = RUB USD EUR KZT UAH CNY MDL AMD UZS AZN KGS TJS TMT GEL LVL LTL GBP
MAIL_FROM = xxxxx
MAIL_FEEDBACK = xxxxx
[email protected]:~/site/app$ git branch
feature/5492_new_currency
* master
production
[email protected]:~/site/app$ cat locale/ru/LC_MESSAGES/lang.po | grep -A 5 -B 5 'msgid "currency:GBP"'
# Узбекистан
msgid "currency:UZS"
msgstr "сум."
# Британский фунт
msgid "currency:GBP"
msgstr "£"
msgid "datepicker:prevText"
msgstr "Пред>"
[email protected]:~/site/app$ git branch -d feature/5492_new_currency
warning: deleting branch 'feature/5492_new_currency' that has been merged to
'refs/remotes/origin/feature/5492_new_currency', but not yet merged to HEAD.
Deleted branch feature/5492_new_currency (was ab38009).
是的,我已經試過'已經啓動對date' –
好吧,我們對此深感抱歉!你嘗試過調試嗎? –
號您的意思是?我應該運行什麼? –