git partial merge, not whole branch

by

There are a couple things you can do.

One, you can cherry-pick the changes you want, which applies only a single commit. For example, if there’s a change that only touches config.xml, you can cherry-pick it with

$ git cherry-pick $COMMIT_ID_YOU_WANT

You could also just grab config.xml from the development branch:

$ git checkout testing
$ git checkout development -- config.xml

That’ll get you the same version of config.xml that exists in the development branch, but note that it won’t pull in the history of changes to the file.

More Related Contents:

  1. How to replace master branch in Git, entirely, from another branch? [duplicate]
  2. How do you merge two Git repositories?
  3. How to merge a specific commit in Git
  4. Git cherry pick and datamodel integrity
  5. Updates were rejected because the remote contains work that you do not have locally
  6. Is it possible for git-merge to ignore line-ending differences?
  7. Merging: Hg/Git vs. SVN
  8. What is the precise meaning of “ours” and “theirs” in git?
  9. git cherry-pick says “…38c74d is a merge but no -m option was given”
  10. Git – Ignore files during merge
  11. `git merge -s theirs` needed but it does not exist
  12. Git Cherry-pick vs Merge Workflow
  13. Trying To Understand/Determine A Basic Git Workflow
  14. Pull a certain branch from the remote server
  15. git rebase and git push: non-fast forward, why use?
  16. Disable Git Rename Detection
  17. Simple tool to ‘accept theirs’ or ‘accept mine’ on a whole file using git
  18. How to “git show” the diffs for a merge commit?
  19. How can I get the parents of a merge commit in Git?
  20. Git: merging public and private branches while while keeping certain files intact in both branches
  21. How would I write a pre-merge hook in Git?
  22. Are there any downsides to enabling git rerere?
  23. Reverting a git merge while allowing for the same merge later)
  24. Error “Updates were rejected because the remote contains work that you do not have locally”
  25. What to do with branch after merge
  26. Git: How to create patches for a merge?
  27. git: How do I add a custom merge strategy?
  28. git subtree: possible to change subtree branch/path in a forked repository?
  29. Whats the Proper usage of .gitattributes with merge=ours
  30. git merging branches in a bare repository

Leave a Comment