On 05/08/2013 08:32 AM, Lucas Meneghel Rodrigues wrote: > Hello everyone, > > Given that we're handling a specially tough merging procedure, some > mistakes were bound to happen. I had to edit some commit messages and > authors to get a more acceptable upstream result. Given that next is > supposed to be a non fast forward branch it is OK, but I apologize for > the inconvenience. > > Cheers, > > Lucas
In case it's not clear, this means everyone will need to update their upstream remote, hard-reset next, and rebase all local topic/tracking branches. Though I don't think there will be any/many conflicts since I believe this was mostly new tests that caused the problem. -- Chris Evich, RHCA, RHCE, RHCDS, RHCSS Quality Assurance Engineer e-mail: cevich + `@' + redhat.com o: 1-888-RED-HAT1 x44214 _______________________________________________ Virt-test-devel mailing list [email protected] https://www.redhat.com/mailman/listinfo/virt-test-devel
