Git: Merge a Commit into a different Branch

by

Merging only one or a few commits mean using git cherry-pick

First cancel the merge you just did: see “Undo a Git merge?“.
Then:

git checkout version_1
git cherry-pick <commit checksum>

That can apply to multiple commits or a range of commits: see “How to cherry pick a range of commits and merge into another branch“.

More Related Contents:

  1. When would you use the different git merge strategies?
  2. How to import existing Git repository into another?
  3. What’s the difference between ‘git merge’ and ‘git rebase’?
  4. How can I prevent foxtrot merges in my ‘master’ branch?
  5. Updates were rejected because the remote contains work that you do not have locally
  6. Trying To Understand/Determine A Basic Git Workflow
  7. Merge changes from remote github repository to your local repository
  8. Why Git is not allowing me to commit even after configuration?
  9. Error “Updates were rejected because the remote contains work that you do not have locally”
  10. Tell git not to merge binary files but to choose
  11. How to delete the last n commits on Github and locally?
  12. git: merge two branches: what direction?
  13. Editing the git commit message in GitHub
  14. Add commits before root commit in Git? [duplicate]
  15. The following untracked working tree files would be overwritten by merge, but I don’t care
  16. How to determine the URL that a local Git repository was originally cloned from?
  17. Re-doing a reverted merge in Git
  18. How to remove file from Git history?
  19. Remove specific commit
  20. Git: Could not resolve host github.com error while cloning remote repository in git
  21. Git: ignore some files during a merge (keep some files restricted to one branch)
  22. There is no tracking information for the current branch
  23. Can deleted .git be restored?
  24. How do I avoid the specification of the username and password at every git push?
  25. How to fix commit order in GitHub pull requests, broken by git rebase?
  26. Can I update a forked project, on git, to the original/master copy?
  27. How do I fix “remote: fatal error in commit_refs” errors trying to push with Git?
  28. Git: How to make outer repository and embedded repository work as common/standalone repository?
  29. Telling if a Git commit is a Merge/Revert commit
  30. Git push error: RPC failed; result=56, HTTP code = 200 fatal: The remote end hung up unexpectedly fatal

Leave a Comment