Copy changes from one branch to another in Git
This article discussed two methods we can use in Git to copy changes from one branch to another.
Copy changes from one branch to another in Git
git mergeWe are all too familiar
with the command. We can use it to merge two branches into one.
This command can also be a way to copy changes from one branch to another. However, we can only use it when we want to copy all changes from a branch.
Assume we have a Master branch in our repository . From our Master branch, we created a new branch called Dev2.1 .
Of course, our new branch will inherit all the commits in the Master branch. Then we will start developing our Dev2.1 branch.
To copy all the changes from our Dev2.1 branch to our Master branch, we can merge the two as shown below.
First, we have to checkout to the Master branch.
Order:
$ git checkout Master
Now we can merge Dev2.1 into the Master branch.
Order:
$ git merge Dev2.1
You may encounter merge conflicts that you must resolve manually to complete the merge.
Let's say we want to copy a specific change to the Master branch. We will make some commits in our Dev2.1 branch so that it is ahead of our Master branch and will try to copy a commit.
Here is a comparison between our branches.
From the output above, our Dev2.1 is two commits ahead of Master . Suppose we only want to copy the changes introduced by the Python script commit from our Dev2.1 branch to our Master branch.
To copy the changes, we use the git cherry-pick command and the SHA-1 of the Python script command as shown below.
Let's switch to our master branch:
$ git checkout Master
To copy the changes:
$ git cherry-pick 2521a66
Output:
We can see that git has copied the changes from the Python Scripts commit to the Mastergit log branch. This commit should be visible if we run the command.
Order:
$ git log --oneline
Output:
Summarize
We can copy changes from one branch to another using the git mergeand commands. We can specify changes using the command, while the command copies all changes.git cherry-pickgit cherry-pickgit merge
For reprinting, please send an email to 1244347461@qq.com for approval. After obtaining the author's consent, kindly include the source as a link.
Related Articles
Undo Git Stash
Publish Date：2025/04/04 Views：186 Category：Git
-
This article explains how to make and save changes to a repository. Git allows you to save changes locally and push them to a server when needed. In Git, we don't use the term save , but commit . We use git add , git commit , and git stash
View a list of cache entries in Git
Publish Date：2025/04/04 Views：58 Category：Git
-
We often need to pause our work and focus on something else in our development environment. Therefore, we may need to temporarily save our current work and focus on a different one. We may want to resume our original work later. git stash T
Git stores specific files
Publish Date：2025/04/04 Views：115 Category：Git
-
This article will cover storing changes to only specific files in Git. In Git, when we make some changes in our working tree, we may have some changes which may or may not be staged in our local repo. We may now wish to save these changes f
Git Stash and Shelve in IntelliJ IDEA
Publish Date：2025/04/04 Views：111 Category：Git
-
git stash This article will distinguish between and when using IntelliJ IDEA git shelve . These two come into play when we want to switch between multiple tasks while working and return to them later. IntelliJ IDEA allows us to work on diff
Deleting a submodule in Git
Publish Date：2025/04/04 Views：191 Category：Git
-
This article explains how to delete a submodule in git. When developing software projects, we often use external frameworks and libraries required by our projects. These frameworks and libraries may be open source and stored in git reposito
Pull the latest Git submodule
Publish Date：2025/04/04 Views：112 Category：Git
-
In this article, we will introduce Git submodules. Under this, we will cover the following. Steps you can take to pull the latest submodule. How to set up submodules. How to push updates to a Git submodule. How to clone a submodule. Using G
Submodule updates in Git
Publish Date：2025/04/04 Views：133 Category：Git
-
Submodules are a way to keep a Git repository as a subdirectory in the current branch. Submodules are usually imported from third-party repositories. For example, a large project might have a submodule that contains a library. submodule Can
Listing submodules in Git
Publish Date：2025/04/04 Views：173 Category：Git
-
In this article, we will discuss Git submodules. We will cover what they are, the purpose of submodules, and the general workflow. Git submodules allow us to keep one repo as a subdirectory of another repo. In short, a submodule is a refere
Switch remote Git branch
Publish Date：2025/04/04 Views：182 Category：Git
-
This article will show you how to switch remote Git branches using checkout the command. The version control tool that allows you to support and manage variable versions of your application in a team of members is the Git version control to
