You can apply a commit from another branch without switching branches by using the git cherry-pick command. This command allows you to take a specific commit from one branch and apply it to your current branch.
Here’s how you can do it:
1. Find the commit hash: First, you need to identify the commit hash of the commit you want to apply. You can do this by checking the log of the other branch:
git log other-branch
Replace other-branch with the name of the branch from which you want to apply the commit. Note the hash of the commit you want to cherry-pick.
2. Cherry-pick the commit: With the commit hash in hand, you can then run:
git cherry-pick <commit-hash>
Replace <commit-hash> with the actual hash you obtained in step 1.
3. Resolve any conflicts: If there are any conflicts during the cherry-pick process, Git will notify you. You will need to manually resolve the conflicts in the affected files. Once resolved, you can continue the cherry-pick with:
git cherry-pick --continue
4. Complete the process: After resolving any conflicts and successfully applying the commit, your current branch will include the changes from the specified commit.
That's it! You have successfully applied a commit from another branch without leaving your current branch.