On 18/05/17 16:20, Andrew Grimberg wrote: > After all, as I > page through all the opens as I get back to ~2 months a large portion of > the changes are in 'Merge Conflict'. That obviously doesn't mean that > they can't be easily brought back to a point of being a mergeable state.
Right, 'Merge Conflict' onlu indicates that they overlap with something merged. Most of the time a rebase will go through just fine (which is weird and shows Gerrit is not really trying to be accurate) or a git 3-way merge works... Regards, Robert
signature.asc
Description: OpenPGP digital signature
_______________________________________________ Discuss mailing list [email protected] https://lists.opendaylight.org/mailman/listinfo/discuss
