How can I just merge the source code files, say *.h and *.cpp, in Git?
The repository on Github contains the whole solution file including project and compiler data and build executables.
Asked
Active
Viewed 109 times
1 Answers
1
You can declare a merge driver in a .gitattributes file in order to:
- keep your destination version if it is not a
.cppor.h(as in this answer) git checkout the source into your current branch for the other file (that will trigger a merge for that file, as described in "Git Tip: How to "Merge" Specific Files from Another Branch", referenced in "How do you merge selective files with git-merge?")
There is actually no easy way to trigger a merge that way
Another option is described in this answer:
git merge --no-commit branchSource
# for each non .cpp or .h files:
git checkout branchDestination -- file
But that is a bit cumbersome.
That being said, a merge should involve the all content of a commit, which is why not* versioning elements you don't want to merge is a good idea.
When those elements can be generated at will (build executable), this is twice a good idea (as commented by KingCrunch).
-
`git checkout` will do a merge? That doesn't sound right. Won't `git checkout
-- – John Szakmeister Dec 29 '12 at 18:25` grab the versions of the file on ` `? I didn't think it performed any merge operation here. -
@jszakmeister true: I have fixed the answer to include a way to merge everything, and restore the destination branch version. – VonC Dec 29 '12 at 20:07