Ignore the folder in a stable, but not in the branch

Question

I have the following folder structure for my project

src/
   test_unit/
   package1/
      test_unit/
   package2/
      test_unit
output/

In my devel branch, all folders should be versioned, but the master / stable branch should ignore and not combine test_unit / and output / folder.

How can i achieve this? With .gitignore, it will not work because .gitignore will be merged between branches.

+3

Marten bauer Dec 18 '09 at 10:05

2 answers

VonC · Answer 1 · 2009-12-18T12:45:24+0000

Try a combination of files .gitignoreand .gitattributes:

in the branch master/stable, you can have .gitattributes, referring to a custom merge driver that effectively ignores .gitattributesand .gitignorecoming from the test_unit folders.
devel, .gitattributes, .gitignore, test_unit master, .gitattributes.

, .gitignore test_unit master: devel .

mkenyon · Answer 2 · 2009-12-18T10:26:07+0000

, , , , . , , , :

 - List item
 - List item
  - List item
 - List item

: