git 当前分支修改转移到其他分支

需要在branch B 分支上修改代码，发现不小心在branch A分支下进行了修改，又不想在branch B上重新修改一遍代码，
怎么做更高效呢？

修改尚未commit

把branch A上修改的代码转移到branch B下，即可

# A分支下操作
$ git stash

# B分支下操作
$ git stash pop
# 查看修改显示:对应的修改合入B分支了
$ git status -sb

操作示例

# A分支下操作
$ git status -sb
## A
test.php +++
student.php +++
$ git stash
Saved working directory and index state WIP on A: 38ea1a4 Merge branch 'C' into A

# B分支下操作
$ git stash pop
On branch B
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)
        modified: test.php
        modified: student.php
no changes added to commit (use "git add" and/or "git commit -a")
Dropped refs/stash@{0} (1bb7061e772ceb0712d72fe5528efe2ea10c6cfd)
$ git status -sb
## B
 M test.php
 M student.php


...other operator

修改已经commit

# A分支下操作
$ git log
commit 542ed9acb7d54c4431eda351db53f616d826a2bd
Author: test <test.com>
Date:   Fri Apr 24 09:19:31 2020 +0800
    test update
# 根据commit时的备注，找到修改代码的commitID，复制下来
# 如 542ed9acb7d54c4431eda351db53f616d826a2bd

# B分支下操作
# 转移commit
$ git cherry-pick commitID
# 如 git cherry-pick 542ed9acb7d54c4431eda351db53f616d826a2bd

# 查看修改显示:对应commitid的修改合入B分支了
$ git status -sb

秒客网

git 当前分支修改转移到其他分支

相关文章