How do I merge changes to a single file, rather than merging commits?

by

I came across the same problem. To be precise, I have two branches A and B with the same files but a different programming interface in some files. Now the methods of file f, which is independent of the interface differences in the two branches, were changed in branch B, but the change is important for both branches. Thus, I need to merge just file f of branch B into file f of branch A.

A simple command already solved the problem for me if I assume that all changes are committed in both branches A and B:

git checkout A

git checkout --patch B f

The first command switches into branch A, into where I want to merge B‘s version of the file f. The second command patches the file f with f of HEAD of B. You may even accept/discard single parts of the patch. Instead of B you can specify any commit here, it does not have to be HEAD.

Community edit: If the file f on B does not exist on A yet, then omit the --patch option. Otherwise, you’ll get a “No Change.” message.

More Related Contents:

  1. How to replace master branch in Git, entirely, from another branch? [duplicate]
  2. How to remove local (untracked) files from the current Git working tree
  3. Modified files in a git branch are spilling over into another branch
  4. How to merge a specific commit in Git
  5. Can I recover a branch after its deletion in Git?
  6. How to get just one file from another branch?
  7. Git cherry pick and datamodel integrity
  8. Updates were rejected because the remote contains work that you do not have locally
  9. How is a tag different from a branch in Git? Which should I use, here?
  10. Create a branch in Git from another branch
  11. fetch in git doesn’t get all branches
  12. Move branch pointer to different commit without checkout
  13. `git merge -s theirs` needed but it does not exist
  14. Git Cherry-pick vs Merge Workflow
  15. Is there a way to lock a branch in GIT
  16. How do I create a remote Git branch?
  17. Push commits to another branch
  18. How do I commit only some files?
  19. Making Git retain different section content between branches
  20. Git: Merge to master while automatically choosing to overwrite master files with branch
  21. Git undo local branch delete
  22. Git: merging public and private branches while while keeping certain files intact in both branches
  23. How would I write a pre-merge hook in Git?
  24. Update Git branches from master
  25. Are there any downsides to enabling git rerere?
  26. Error “Updates were rejected because the remote contains work that you do not have locally”
  27. git: How do I add a custom merge strategy?
  28. How do I run git log to see changes only for a specific branch?
  29. git merging branches in a bare repository
  30. How to pull remote branch from somebody else’s repo

Leave a Comment