git rebase --continue 命令无法正常工作
git rebase --continue command not getting work
大家好,我正在尝试从 origin master 重新设置本地分支
步数
git pull origin master
git checkout driver_management
git rebase master
git add .
git rebase --continue
while exicute git rebase --continue cmd getting this msg
added new fields in driver model #67
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# interactive rebase in progress; onto 62effa7
# Last commands done (3 commands done):
# pick 9e6cbf8 added urls for token authonetication web api #67
# pick e472943 added new fields in driver model #67
# Next command to do (1 remaining command):
# pick d6dcca9 fixed driver form new field added
# You are currently rebasing branch 'driver_management' on '62effa7'.
#
# Changes to be committed:
# modified: fleet/forms.py
# new file: fleet/migrations/0091_auto_20220107_1046.py
# modified: fleet/models.py
# modified: fleet/templates/hiringprocess/driver_allocationform.html
# modified: fleet/templates/hiringprocess/edit_drivers.html
# modified: fleet/views.py
#
~
~
E:/10dec_everestfleet/everest_jarvis/.git/COMMIT_EDITMSG [unix] (15:08 14/01/2022)
我不知道接下来要做什么,我被困在那里
您在问题中粘贴的 window 文本只是一个手动暂停,要求提交消息,然后再进行提交并继续变基。如果您对编辑器中已有的提交消息没有意见,只需执行 ESC,然后 SHIFT + :wq + 输入。如果你想先编辑那个提交信息,然后做 SHIFT + I,进行编辑,然后使用上面的命令保存并关闭window.
大家好,我正在尝试从 origin master 重新设置本地分支
步数
git pull origin master
git checkout driver_management
git rebase master
git add .
git rebase --continue
while exicute git rebase --continue cmd getting this msg
added new fields in driver model #67
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# interactive rebase in progress; onto 62effa7
# Last commands done (3 commands done):
# pick 9e6cbf8 added urls for token authonetication web api #67
# pick e472943 added new fields in driver model #67
# Next command to do (1 remaining command):
# pick d6dcca9 fixed driver form new field added
# You are currently rebasing branch 'driver_management' on '62effa7'.
#
# Changes to be committed:
# modified: fleet/forms.py
# new file: fleet/migrations/0091_auto_20220107_1046.py
# modified: fleet/models.py
# modified: fleet/templates/hiringprocess/driver_allocationform.html
# modified: fleet/templates/hiringprocess/edit_drivers.html
# modified: fleet/views.py
#
~
~
E:/10dec_everestfleet/everest_jarvis/.git/COMMIT_EDITMSG [unix] (15:08 14/01/2022)
我不知道接下来要做什么,我被困在那里
您在问题中粘贴的 window 文本只是一个手动暂停,要求提交消息,然后再进行提交并继续变基。如果您对编辑器中已有的提交消息没有意见,只需执行 ESC,然后 SHIFT + :wq + 输入。如果你想先编辑那个提交信息,然后做 SHIFT + I,进行编辑,然后使用上面的命令保存并关闭window.