Search
 
SCRIPT & CODE EXAMPLE
 

SHELL

add changes from different branch

#Solution 1: Use the git checkout command
#The git checkout command offers a simple way to get a file or a folder from another branch.

#Here is the syntax to checkout a file from another branch:

git checkout <other-branch-name> -- path/to/your/folder

#1. Checkout to the branch where you want to copy the file.

git checkout feature/A

#2. Once you are on the correct branch, copy the file.

git checkout feature/B -- utils.js

#3. Use the git status command to ensure that the file has been copied.

#4. Commit and push to a remote.

#When using the checkout command, you can also get:

#A folder from another branch.
#Multiple files by specifying each one of them.
#Also, note that you can get a file/folder from the stash.

#Solution 2: Use the git restore command
#Another option is to use the git switch command with the git restore command.

#If you have never heard about those two commands, that's alright. They are relatively new. Git introduced them in version 2.23 in 2019.

#The purpose of those two commands is to split up the git checkout command's responsibilities to simplify it for users.

#The git restore command restores the working tree.

#The git switch command switches branches.

#Here is the process to follow to get a file from another branch:

#1. Switch to the branch where you want to checkout the file.

git switch feature/A

#2. Get the file from the other branch.

git restore --source feature/B -- utils.js

#3. Commit and push the changes.

#Solution 3: Use the git show command
#Finally, we can use the git show command.

#Here is the process to follow:

#1. Switch to the working branch.

git switch feature/A

#2. Get the file from the other branch.

git show feature/B:path/utils.js > path/utils.js

#3. Commit and push the changes.

#Note: You need to specify the relative path from your directory's root this time.
Comment

PREVIOUS NEXT
Code Example
Shell :: macbook pro mac address 
Shell :: remove folder from git repository 
Shell :: rsync ssh 
Shell :: docker auto start when reboot 
Shell :: multiple ssh key 
Shell :: docker for ubuntu 
Shell :: current git id 
Shell :: reaect native reactotron 
Shell :: add user sudoers arch 
Shell :: install aptitude ubuntu 20.04 
Shell :: install tree in centos 7 
Shell :: git force add ignored file 
Shell :: install google assistant on linux 
Shell :: linux change user password 
Shell :: git revert to old commit 
Shell :: uncommit local commit 
Shell :: delete git branch 
Shell :: bash add comma to end of line 
Shell :: ubuntu software not showing apps 20.04 
Shell :: exit vim without saving 
Shell :: read the file from shell 
Shell :: django start project in existing directory 
Shell :: bash arrays 
Shell :: wc bash 
Shell :: git use cat instead of less 
Shell :: change or set password interactively prompt in linux 
Shell :: create ssh key 
Shell :: view process in linux 
Shell :: cherry pick from another repository 
Shell :: install watchman on linux 
ADD CONTENT
Topic
Content
Source link
Name
1+3 =