| [02:16] <tjaalton> jcristau: I've toyed with it somewhat, and it looks like a rebase works just fine | |
| [02:17] <tjaalton> but I'll play with it more tomorrow | |
| [21:47] <tjaalton> jcristau: heh, it was a breeze doing just the way you advised | |
| [21:48] <tjaalton> only conflicts were some files that are deleted in the packaging branch | |