Could someone (preferably who ever added the code) please merge 2.8 to master.
I wish to add code to 2.8 and merge up but the merge is full of conflicts.

Might I humbly suggest that when code is added to an older branch, the 
developer should merge right away if there are conflicts. In this way the 
person who knows the code changes can make sure the merge is right.

Chris M

_______________________________________________
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers

Reply via email to