Git: ignore some files during a merge (keep some files restricted to one branch)
GitMergeGit Problem Overview
I have two branches, A and B. Branch A have a directory examples with some files that are tracked by git, and these files should not appear on branch B. In my workflow, I do merge changes made in A into B often, which is a problem every time that there is some changes on examples. For the moment I am doing this manually: erasing the files after the merge or solving conflicts when there was a change to a file that I had already erased.
Is it possible to ignore these files during a merge? (Or is it possible to keep some files restricted to one branch (A) or away from one branch (B)?)
Let me try to explain why I am doing this:
A is a skeleton of a blog (template, scripts, etc), B is my blog (A filled with my own posts, images, drafts, etc). A is public and I am trying to make it generic to others look and use it, but because of this I need some posts there as a showcase/tests (the examples directory). Every change in A and is later merged into B to have this changes on my blog instance -- this way all new examples appear in B and all deleted examples in B that have been changed in A since last merge results in a conflict.
Git Solutions
Solution 1 - Git
I found a good answer here: stackoverflow Q332528
It uses ideas taken from here: Pro-Git merge strategies
Here is a copy of it:
> Let's say you want to exclude the file config.php
>
> On branch A:
>
> 1. Create a file named '.gitattributes' in the same dir, with this
> line: config.php merge=ours. This tells git what strategy to use
> when mergin the file. In this case it always keep your version, ie.
> the version on the branch you are merging into.
>
> 2. Add the .gitattributes file and commit
>
> On branch B: repeat steps 1-2
>
> Try merging now. Your file should be left untouched.
Edit:
From the git book regarding merge=ours, "One very useful option is to tell Git to not try to merge specific files when they have conflicts, but rather to use your side of the merge over someone else’s."
So, this answer doesn't apply as well as it might to the question. pjmorse's answer regarding using submodules is good.
Another option would be to use a sub-tree merge, which may have added benefits.
Solution 2 - Git
You might find git's rerere command useful. With that you can record resolutions for certain merge conflicts and reuse them later.
Solution 3 - Git
With your updates: Yes, submodules would be appropriate for this use if all of A fits in a subdirectory of B (or vice versa). An example of submodules using WordPress would be if you have a git repository of Wordpress; you could add a submodule for a theme which would be inside the /wp-content/themes/ directory.
The documentation for submodules might help.
If the files from the two are interleaved, it might be tougher. Most cases where submodules can be used in this way, the application in question was designed to allow for them.