git workflow with vendor directory

Question

I have two branches in my git repo master and production. The main difference is that in production, the vendor directory has been checked in and is not present in the .gitignore

My issue is when I switch from production to master

git checkout master

the whole vendor directory gets wipped out.

What are my options?

Have a look at this answer: http://stackoverflow.com/a/2692957/955926 — Gary Fixler, Nov 30 '13 at 06:53

score 4 · Answer 1 · edited May 23 '17 at 12:05

4

Try a 'skip-worktree' (from git update-index):

git update-index --skip-worktree -- vendor

When on the branch production.
See if, when checking out the master branch, that directory is deleted.

edited May 23 '17 at 12:05

Community

1
1

answered Nov 30 '13 at 06:54

VonC

1,262,500
529
4,410
5,250

@user391986 is `vendor` tracked (added and committed)? – VonC Dec 03 '13 at 03:41

git workflow with vendor directory

1 Answers1