Doubt in the realization of branches

Navigation
-1

I have a question about competing files while developing a project.

For example, a team modified a DLL in the XPTO project, after its development was completed and before being sent for homologation a comparison was made with Production and we verified that this same class was modified.

I solved the conflict, but how can I guarantee that when the homologation of this new feature is finished (maybe it takes 1 month) the same DLL will be changed in production again?

    
asked by anonymous 08.03.2014 / 03:16

1 answer

0

After homologation, a merge with Main must be made. This will ensure that the modification is passed on to the mainstream.

As with the first time, more conflicts will probably be needed.

In the following link there is a general procedure for how to proceed: link

    
08.03.2014 / 07:54
Querying Active Directory distribution groups Alternatives mobile development - Java FX, Android, CodenameOne [closed]