=== cr3 [n=marc@pdpc/supporter/bronze/cr3] has joined #ubuntu-installer === jetsaredim [n=jgreenwa@inet-netcache2-o.oracle.com] has joined #ubuntu-installer === jetsaredim [n=jgreenwa@inet-netcache2-o.oracle.com] has left #ubuntu-installer [] === gordon [n=gordon@cpe-76-183-180-212.tx.res.rr.com] has joined #ubuntu-installer === gordon [n=gordon@cpe-76-183-180-212.tx.res.rr.com] has left #ubuntu-installer ["Ex-Chat"] === mpt [n=mpt@121-72-128-156.dsl.telstraclear.net] has joined #ubuntu-installer === mpt [n=mpt@121-72-128-156.dsl.telstraclear.net] has joined #ubuntu-installer === mpt [n=mpt@121-72-128-156.dsl.telstraclear.net] has joined #ubuntu-installer === mpt [n=mpt@121-72-128-156.dsl.telstraclear.net] has joined #ubuntu-installer === mgalvin [n=mgalvin@ubuntu/member/mgalvin] has joined #ubuntu-installer === cr3 [n=marc@pdpc/supporter/bronze/cr3] has joined #ubuntu-installer === HackComplete [i=fairytal@scream.for.change.inf0.ws] has joined #ubuntu-installer === thom [n=thom@amnesiac.heapspace.net] has joined #ubuntu-installer === jetsaredim [n=jgreenwa@inet-netcache3-o.oracle.com] has joined #ubuntu-installer === jetsaredim [n=jgreenwa@inet-netcache3-o.oracle.com] has left #ubuntu-installer [] === ge75056 [n=chatzill@cpe-76-183-180-212.tx.res.rr.com] has joined #ubuntu-installer === ge75056 [n=chatzill@cpe-76-183-180-212.tx.res.rr.com] has left #ubuntu-installer [] [06:00] ubiquity: jriddell * r2015 trunk/ (83 files in 4 dirs): [06:00] ubiquity: Merge with trunk [06:00] ubiquity: install partitionsbar in ubiquity-frontend-kde.install [06:02] ubiquity: jriddell * r2016 trunk/ (debian/changelog ubiquity/frontend/kde-ui.py): Only translate QWidgets (LP: #103575) [06:42] ubiquity: evand * r1497 ma/ (88 files in 6 dirs): Merged with trunk. [07:07] 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] makes revision numbers very confusing when you do that [07:08] either pull and then push over the top, or merge and then push to somewhere else === cjwatson wonders if there's any way for him to recover the old branch state [07:08] also don't merge and make real new changes in the same commit [07:17] yes, that was a mistake [07:20] I don't think I can get my old branch back :( [07:29] erk, sorry [07:30] I'll stop working in a local branch anyway, just do a checkout should avoid such problems [08:13] yes, that would be better