← Back to team overview

launchpad-dev team mailing list archive

Thread
Date

Upcoming possible conflict merging devel into db-devel

To: Launchpad Community Development Team <launchpad-dev@xxxxxxxxxxxxxxxxxxx>
From: Gary Poster <gary.poster@xxxxxxxxxxxxx>
Date: Wed, 6 Apr 2011 13:40:05 -0400

There's a conflict merging devel into db-develthat could come up.  We have attempted to make it not happen via https://code.launchpad.net/~danilo/launchpad/db-add-subscription-link/+merge/56622 , which is running through ec2 land for db-devel, so hopefully there's nothing that needs to be done.  However, if a conflict does show up, look for the branch above to resolve it.

Thanks

Gary