Question

这是我的"git show feature/2.8.0"

$ git show feature/2.8.0 
commit 47c58e2f8fa6064779e9b059587db388dc233265
Author: laxmikantG <laxmikant@gmail.com>
Date:   Thu Apr 3 09:43:15 2014 +0530

    Bug #68281

diff --git a/inheritance_tax/src/lib/form/ihtx_f_01_00_00_00_00_h240401_init.erl b/inheritance_tax/src/lib/form/ihtx_f_01_00_00_00_00_h240401_init.erl
index c3573cd..047c7df 100644
--- a/inheritance_tax/src/lib/form/ihtx_f_01_00_00_00_00_h240401_init.erl
+++ b/inheritance_tax/src/lib/form/ihtx_f_01_00_00_00_00_h240401_init.erl
@@ -24,8 +24,8 @@ process(AncestorId) ->
                        %%'F_02_0055', data_util:to_timestamp_list(form_util:create_list(date_of_birth, Heirs)),
             'F_02_0055', form_util:create_list(date_of_birth, Heirs),
                        'F_02_0056', form_util:create_list(age, Heirs),
-                       'F_02_0057', form_util:create_list(zip_code, Heirs),
-                       'F_02_0058', form_util:create_list(address, Heirs),
+                       'F_02_0057', form_util:create_list(address, Heirs),
+                       'F_02_0058', form_util:create_list(zip_code, Heirs),
                        'F_02_0059', form_util:create_list(phone_number, Heirs),
                        'F_02_0060', form_util:create_list(relationship, Heirs),
                        'F_02_0061', form_util:create_list(occupation, Heirs),

我错误地将我的更改提交到feature/2.8.0。但还没推。我必须承诺并将其推向＆＃34;开发＆＃34;科。

谢谢

Answer 1

Cherry-选择所需分支的提交：

git checkout develop
git cherry-pick feature/2.8.0

然后回滚分支：

git checkout feature/2.8.0
git reset --hard HEAD^

是否有任何直接的git命令将更改推送到另一个分支

1 个答案: