将更改从一个分支复制到另一个分支

Question

I have a branch named BranchA from master . I have some changes in BranchA (I am not going to merge changes from BranchA to master ).

Now I have created another branch from master named BranchB .

How can I copy the changes from BranchA to BranchB ?

Answer 1

git checkout BranchB
git merge BranchA
git push origin BranchB

This is all if you intend to not merge your changes back to master. Generally it is a good practice to merge all your changes back to master, and create new branches off of that.

Also, after the merge command, you will have some conflicts, which you will have to edit manually and fix.

Make sure you are in the branch where you want to copy all the changes to. git merge will take the branch you specify and merge it with the branch you are currently in.

Answer 2

Instead of merge, as others suggested, you can rebase one branch onto another:

git checkout BranchB
git rebase BranchA

This takes BranchB and rebases it onto BranchA , which effectively looks like BranchB was branched from BranchA , not master .

Answer 3

This is 2 step process

• git checkout BranchB ( destination branch is BranchB, so we need the head on this branch)
• git merge BranchA (it will merge BranchB with BranchA. Here you have merged code in branch B)

If you want to push your branch code to remote repo then do

• git push origin master (it will push your BranchB code to remote repo)

Answer 4

Copy content of BranchA into BranchB

git checkout BranchA
git pull origin BranchB
git push -u origin BranchA

Answer 5

Merge the changes from BranchA to BranchB. When you are on BranchB execute git merge BranchA

Answer 6

If you are using tortoise git .

please follow the below steps.

1. Checkout BranchB
2. Open project folder, go to TortoiseGit --> Pull
3. In the pull screen, Change the remote branch BranchA and click ok.
4. Then right-click again, go to TortoiseGit --> Push .

Now your changes moved from BranchA to BranchB

Answer 7

对我来说，解决方案是 - 将当前更改存储在分支中，然后切换分支，然后将该存储应用到该分支。