ubuntu-touch-coreapps-reviewers team mailing list archive

Thread
Date

Re: [Merge] lp:~gary-wzl77/ubuntu-calendar-app/lunar_calendar_support into lp:ubuntu-calendar-app

To: "Gary.Wang" <Gary.Wang@xxxxxxxxxxxxx>
From: Nicholas Skaggs <nskaggs@xxxxxxxxxx>
Date: Tue, 02 Feb 2016 20:28:21 -0000
In-reply-to: <20151123093107.32755.7137.launchpad@ackee.canonical.com>
Reply-to: mp+278288@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

Review: Needs Fixing

I'm not sure what is wrong with the branch, but bzr REALLY REALLY doesn't like it. It also doesn't merge cleanly anymore :-(

Text conflict in DayView.qml
Text conflict in HeaderDateComponent.qml
Text conflict in MonthComponentDateDelegate.qml
Text conflict in MonthView.qml
Text conflict in ViewHeader.qml
Text conflict in WeekView.qml
Text conflict in YearView.qml
Text conflict in calendar.qml
Text conflict in po/com.ubuntu.calendar.pot
9 conflicts encountered.   

Can you fix the conflicts or better -- create a fresh branch from trunk and submit?
-- 
https://code.launchpad.net/~gary-wzl77/ubuntu-calendar-app/lunar_calendar_support/+merge/278288
Your team Ubuntu Calendar Developers is subscribed to branch lp:ubuntu-calendar-app.