How to merge specific files from Git branches

by

When content is in file.py from branch2 that is no longer applies to branch1, it requires picking some changes and leaving others. For full control do an interactive merge using the --patch switch:

$ git checkout --patch branch2 file.py

The interactive mode section in the man page for git-add(1) explains the keys that are to be used:

y - stage this hunk
n - do not stage this hunk
q - quit; do not stage this hunk nor any of the remaining ones
a - stage this hunk and all later hunks in the file
d - do not stage this hunk nor any of the later hunks in the file
g - select a hunk to go to
/ - search for a hunk matching the given regex
j - leave this hunk undecided, see next undecided hunk
J - leave this hunk undecided, see next hunk
k - leave this hunk undecided, see previous undecided hunk
K - leave this hunk undecided, see previous hunk
s - split the current hunk into smaller hunks
e - manually edit the current hunk
? - print help

The split command is particularly useful.

More Related Contents:

  1. Undo a Git merge that hasn’t been pushed yet
  2. I ran into a merge conflict. How can I abort the merge?
  3. When do you use Git rebase instead of Git merge?
  4. How to cherry-pick a range of commits and merge them into another branch?
  5. Have Git Select Local Version On Merge Conflict on a Specific File?
  6. How can I selectively merge or pick changes from another branch in Git?
  7. Git workflow and rebase vs merge questions
  8. How can I merge multiple commits onto another branch as a single squashed commit?
  9. Merge, update, and pull Git branches without using checkouts
  10. Re-doing a reverted merge in Git
  11. Why does git perform fast-forward merges by default?
  12. Git merge left HEAD marks in my files
  13. Is there a git-merge –dry-run option?
  14. Resolve Git merge conflicts in favor of their changes during a pull
  15. .gitignore and “The following untracked working tree files would be overwritten by checkout”
  16. How do I safely merge a Git branch into master?
  17. Which version of the git file will be finally used: LOCAL, BASE or REMOTE?
  18. Git merge error “commit is not possible because you have unmerged files”
  19. git merge, keep both
  20. Merge development branch with master
  21. how can I customize git’s merge commit message?
  22. error: Your local changes to the following files would be overwritten by checkout
  23. How can I configure KDiff3 as a merge tool and diff tool for git?
  24. How do I fix a merge conflict due to removal of a file in a branch?
  25. Sharing rerere cache
  26. Restart/undo conflict resolution in a single file
  27. Is there a git-merge –dry-run option?
  28. git: merge two branches: what direction?
  29. Merging two remote repositories in Git
  30. Restore git files deleted after git merge –abort

Leave a Comment