-1
I’m having a question in file competition while developing a project.
For example, a team modified a DLL in the XPTO project after its development was completed and before it was sent for approval a comparison was made with Production and we verified that this same class was modified.
I resolved the conflict, however how can I guarantee that when the approval of this new Feature ends (maybe it takes 1 month) the same DLL will be changed in production again?
0
After approval, a merge with Main. This will ensure that the modification will be passed on to the main development flow.
In the same way as the first time, it will probably be necessary to resolve more conflicts.
In the following link there is a general procedure for how to proceed (in English): http://levelnis.co.uk/blog/tfs-2010-guide-to-branching-and-merging
Browser other questions tagged team-foundation-server
You are not signed in. Login or sign up in order to post.