Saving branches with git

Question

With SVN, I have the following setting:

/tags/
/trunk/
/branches/
/branches/my_feature
/branches/my_other_feature

I want all branches to synchronize with the trunk, so I periodically run svn merge for the branch for the trunk.

However, I also want all branches to synchronize with each other to avoid conflicts, since any given lifetime of a branch can be a couple of months or more. If I have a dozen branches, I will have a nasty mesh with SVN, and that would be impractical.

My question is to use Git instead of SVN help with branch and trunk synchronization?

Answer 1

, rebase.

my_feature :

git rebase master

master (trunk) my_feature.

my_feature my_other_feature , , . my_feature my_other_feature viceversa, .

Answer 2

, . DVCSes (Git, Mercurial Bazaar) , , .

, - , , , SVN.

Answer 3

Note that you must use Git completely instead of SVN in order to get the desired functionality. If you just use Git as the front-end for SVN (vai git svn), this is likely to cause SVN users to not display correctly.