<- Previous Log | Select Different Log | Next Log -> |
Log from 2018-12-30: [00:26:27] *** Joins: steam_bell (~steam_bel@unaffiliated/steam-bell/x-8505715) [00:27:10] *** Parts: steam_bell (~steam_bel@unaffiliated/steam-bell/x-8505715) () [03:51:01] <Z-Man> ct|kyle: Yeah, all the revisions that are not on 0.2.8 will appear twice in your git history if you do a brutal merge. Functionally, it won't mind, but I can really convert your branches so that it doesn't happen. [03:51:11] <Z-Man> You just need to tell me where they are :) [11:03:37] <ct|kyle> Z-Man: lp:~armagetronad-sty-0.3/armagetronad/armagetronad-v2sty lp:~armagetronad-ct/armagetronad/armagetronad-ct lp:~armagetronad-ct/armagetronad/armagetronad-ct-ladderlog lp:~armagetronad-ct/armagetronad/0.4-delaycmd [11:04:36] <ct|kyle> I think those are the ones worth keeping out of mine, maybe lp:~armagetronad-ct/armagetronad/0.4-sdl2 from voodoo's also [14:44:18] *** Quits: physkets (~physkets@unaffiliated/physkets) (Quit: physkets) [21:29:13] *** Joins: Z-Man- (~Z-Man@p5B3261C4.dip0.t-ipconnect.de) [21:29:13] *** Z-Man is now known as Guest33449 [21:29:13] *** Z-Man- is now known as Z-Man [21:32:00] *** Quits: Guest33449 (~Z-Man@p4FE3E3FC.dip0.t-ipconnect.de) (Ping timeout: 250 seconds)View entire month