[06:00] <CIA-16> ubiquity: jriddell * r2015 trunk/ (83 files in 4 dirs):
[06:00] <CIA-16> ubiquity: Merge with trunk
[06:00] <CIA-16> ubiquity: install partitionsbar in ubiquity-frontend-kde.install
[06:02] <CIA-16> ubiquity: jriddell * r2016 trunk/ (debian/changelog ubiquity/frontend/kde-ui.py): Only translate QWidgets (LP: #103575)
[06:42] <CIA-16> ubiquity: evand * r1497 ma/ (88 files in 6 dirs): Merged with trunk.
[07:07] <cjwatson> Riddell: can you not push your trunk over the top of my trunk in future? if you've had to do a merge, it's not the same branch
[07:07] <cjwatson> makes revision numbers very confusing when you do that
[07:08] <cjwatson> either pull and then push over the top, or merge and then push to somewhere else
[07:08] <cjwatson> also don't merge and make real new changes in the same commit
[07:17] <Riddell> yes, that was a mistake
[07:20] <cjwatson> I don't think I can get my old branch back :(
[07:29] <Riddell> erk, sorry
[07:30] <Riddell> I'll stop working in a local branch anyway, just do a checkout should avoid such problems
[08:13] <cjwatson> yes, that would be better