version control - Are there any problems with branching a branch in TFS? -


we branch our whole master branch in tfs, following git-like paradigm rather branching specific sub-folders.

i have 1 such branch, feature. feature ended being 2 features, 1 dependent on other. it's not possible merge master yet, keep features separate can merge part while still work on part b.

say working in branch a; fine branch branch b, , continue working on b? merge master in near future, , merge b master later on.

i don't know if tfs has intelligence make problem if want merge master -> b later on, or if tfs totally 'dumb' tracking branches , doesn't care such things.

in tfs 2012 merging has improved considerably. among improvements auto-merge engine, reduces number of conflicts , baseless merge promotion ui. in case, when there's no merge relationship between 2 branches, baseless merge should performed. once branch relationship established, subsequent merges normal.

for more details see alm rangers version control guide.


Comments

Popular posts from this blog

google app engine - 403 Forbidden POST - Flask WTForms -

Android layout hidden on keyboard show -

Parse xml element into list in Python -