On terça-feira, 22 de janeiro de 2013 07.14.01, Fält Simo wrote: > At the moment, automated merge would always face a merge conflict due to > sync.profile pointing to same branch where it currently is. To get this > sorted out, we would have to leave the sync.profile to serve only one > branch and let the others being hard coded to same branch as the module > being tested. Currently it kind of behaves like this already, while I think > sync.profile in each branch is picking the dependencies from same branch. > But is this ok for developers, is that how you like it to behave? If it is, > which branch should keep obeying the sync.profile and which ones we can > hard code?
Why do you think there would be a conflict in the first place? The conflict has been resolved. It should not appear again. -- Thiago Macieira - thiago.macieira (AT) intel.com Software Architect - Intel Open Source Technology Center
signature.asc
Description: This is a digitally signed message part.
_______________________________________________ Development mailing list [email protected] http://lists.qt-project.org/mailman/listinfo/development
