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
Git installation and establishment of local warehouse service
Publish Date：2025/04/05 Views：89 Category：Git
-
Git is a distributed version control system: the client does not only extract the latest version of the file snapshot, but also completely mirrors the original code repository. It has the following advantages: a. Since every extraction oper
git remote operation——multiple remote repositories for one project
Publish Date：2025/04/05 Views：131 Category：Git
-
Multiple remote repositories for a git project In our git project, the command to operate the remote repository information is $ git remote # 查看当前所有的远程仓库的名称 $ git remote -v # 查看远程仓库的名称和远程仓
Git cherry pick command usage
Publish Date：2025/04/05 Views：190 Category：Git
-
git cherry-pick is a powerful command that allows us to select an arbitrary Git commit by reference and attach it to the HEAD of the current working branch. Cherry picking is the act of picking a commit from one branch and applying it to an
Comparison between Git merge and Git rebase
Publish Date：2025/04/05 Views：171 Category：Git
-
The git rebase command may seem like Git wizardry to beginners, but if used carefully, it can actually make life easier for your development team. In this article, we compare git rebase with the related git merge command and identify all th
How to fix Git error Error: src refspec master does not match any
Publish Date：2025/04/05 Views：124 Category：Git
-
When using Git, we may encounter the error "src refspace master does not match any". Here's what the error means and how to fix it. What does src refspec master does not match any Mean in Git mean? We may encounter this error when we try to
Rebase local branch when pulling changes from remote repository branch in Git
Publish Date：2025/04/05 Views：144 Category：Git
-
This article will cover the basics of rebasing your local branch when pulling changes from a remote repository branch in Git. We use the version control system Git to track changes made to files. We commit changes in a local branch in our l
Undo Git Stash
Publish Date：2025/04/04 Views：187 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：59 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
