Copy changes from one branch to another

Git

Git Problem Overview

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?

Git Solutions

Solution 1 - Git

git checkout BranchB
git merge BranchA

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.

Solution 2 - Git

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.

Solution 3 - Git

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)

Solution 4 - Git

Copy content of BranchA into BranchB

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

Solution 5 - Git

For me the solution was - stash the current changes in the branch and then switch branches and then apply that stash to that branch.

Solution 6 - Git

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

Solution 7 - Git

If you are using tortoise git.

please follow the below steps.

  1. Checkout BranchB
  2. Open project folder, go to TortoiseGit --> Fetch
  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

Solution 8 - Git

Simplified solution using git switch

if you have git 2.23 or above you can use git switch command to do the same since git checkout command used for a lot of things which is confusing sometime


// This command will switch(go) to BranchB
// use flag -c if you haven't created this branch yet 
git switch BranchB 


// git merge combines sequences of commits from BranchA to the 
// current branch (which is BranchB)
git merge BranchA
Categories
Recommended Git Solutions

Previous Solution:

Can I assign a reset index a name?

PythonPandas

Next Solution:

What is the << (double left arrow) syntax in YAML called, and where's it specced?

Yaml

Attributions

All content for this solution is sourced from the original question on Stackoverflow.

The content on this page is licensed under the Attribution-ShareAlike 4.0 International (CC BY-SA 4.0) license.

Content TypeOriginal AuthorOriginal Content on Stackoverflow
QuestionMukil DeepthiView Question on Stackoverflow
Solution 1 - Gitroymustang86View Answer on Stackoverflow
Solution 2 - GitArchieView Answer on Stackoverflow
Solution 3 - GitTULSI JAINView Answer on Stackoverflow
Solution 4 - GitPankaj SinghView Answer on Stackoverflow
Solution 5 - GitiooplView Answer on Stackoverflow
Solution 6 - GitC1sc0View Answer on Stackoverflow
Solution 7 - GitSathiaView Answer on Stackoverflow
Solution 8 - GitNivethanView Answer on Stackoverflow