extended forward
I have Two feature branches: "Feature" and "Featureb" FeatureA have been completed but merged in the trunk because it has not been confirmed whether it should go to the next release or not.
Featurebase is in progress, and it has been found that there are some options actually required for some of the applicable changes
I have a few options, one of which is only DBML and Merge related files. I know that the best practice is the merge / update / citt etc. from the functioning cloning route, but if I want to go ahead what are the problems?
You can merge all the modifications in FeatureAir Branch from what you want (it is a good idea to note the dissection modifications - svnmerge.py does the tool, but I want to keep myself a record). Then undo / remove those changes you do not want (like, as you commented earlier in the question, those amendments Is part of).
I wanted to say: "Later, during the merger of feature trunks and feature B, if the changes made by you were independent of other changes in the Featurebank branch, then there should be no conflict." But I am not sure Is this true or not? That is, there is a conflict / double change if there is a general change in FeatureA and FeatureB, when these changes are merged into the trunk?
A solution takes a safe approach There is a hard accounting and so that any change can not be done again when merged on the trunk later.
A way to simplify the feature to turn on or off In this way, the FeatureA can merge with the trunk in the first place, thus using the flag in the code.
No comments:
Post a Comment