Hi,

we are currenlty planning to migrate a big project from SVN to GIT.
The project in rolled out to multiple countries (currently about 15) and 
each country is based on the "master" but has slight modifications. It's 
not possible to localize everthing.
So our current SVN setup looks like this:

SVN
- master
- trunk
- branches
- feature-111-foo-bar
- bugfix-222-foo-bar
- hotfix-333-foo-bar
- tags
- 1.0.0
- 1.1.0
- 1.1.1
- 1.2.0
- 1.2.1
- de
- trunk
- branches
- trags
- 1.0.0
- 1.1.0
- 1.1.1
- 1.2.1
- us
- trunk
- branches
- trags
- 1.0.0
- 1.2.1

The workflow is the following:
Development is completely done in the master repository.
If a country says "hey version 1.1.0 look good for us. we want to roll this 
out in our country" we are merging the tag into the country repository. 
After the merge some required changes 
are also commited to the trunk. After we have finished the country adjusted 
a tag will be created for the country. 
So there is no real development in the country based repositories. And we 
do just merged the requested tags into the countries.

The question is now what is the best way to do this in git.
1. Create a branch for each country in the origin repository
- then merge "master tags" into the country branch and create a "country 
tag"
2. Create a own git repository for each country that is added as remote
- pull origin tags and merge them into the country repo. then merge the tag 
and create a tag in the country repo

What would you suggest? Do you have similar setups?

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.

Reply via email to