2022-08-22 00:06:17 +0200 | wonko | (~wjc@2a0e:1c80:2::130) |
2022-08-22 00:11:20 +0200 | diep | (~diep@2a01:cb11:2d7:4a00:d1b6:2846:2ccc:ca5c) (Remote host closed the connection) |
2022-08-22 00:14:26 +0200 | diep | (~diep@2a01:cb11:2d7:4a00:cb23:7518:9aad:f148) |
2022-08-22 00:17:40 +0200 | catman | (~catman@user/catman) (Ping timeout: 268 seconds) |
2022-08-22 00:21:01 +0200 | catman | (~catman@user/catman) |
2022-08-22 00:22:07 +0200 | diep | (~diep@2a01:cb11:2d7:4a00:cb23:7518:9aad:f148) (Remote host closed the connection) |
2022-08-22 00:22:37 +0200 | diep | (~diep@2a01:cb11:2d7:4a00:159d:9028:bdc1:3daf) |
2022-08-22 01:10:29 +0200 | catman | (~catman@user/catman) (Quit: WeeChat 3.6) |
2022-08-22 01:12:39 +0200 | catman | (~catman@user/catman) |
2022-08-22 01:24:09 +0200 | wonko | (~wjc@2a0e:1c80:2::130) (Ping timeout: 256 seconds) |
2022-08-22 01:44:33 +0200 | diep | (~diep@2a01:cb11:2d7:4a00:159d:9028:bdc1:3daf) (Remote host closed the connection) |
2022-08-22 02:12:03 +0200 | mvk | (~mvk@2607:fea8:5ce3:8500::a1ec) (Ping timeout: 244 seconds) |
2022-08-22 02:22:12 +0200 | catman | (~catman@user/catman) (Quit: WeeChat 3.6) |
2022-08-22 02:42:02 +0200 | chomwitt | (~chomwitt@2a02:587:dc09:3900:f527:3ca7:b122:fd0c) (Ping timeout: 244 seconds) |
2022-08-22 03:22:01 +0200 | mvk | (~mvk@2607:fea8:5ce3:8500::a1ec) |
2022-08-22 03:34:49 +0200 | catman | (~catman@user/catman) |
2022-08-22 04:04:09 +0200 | banc- | (banc@gateway/vpn/airvpn/banc) (Ping timeout: 252 seconds) |
2022-08-22 04:19:48 +0200 | td_ | (~td@muedsl-82-207-238-189.citykom.de) (Ping timeout: 256 seconds) |
2022-08-22 04:21:34 +0200 | td_ | (~td@muedsl-82-207-238-019.citykom.de) |
2022-08-22 04:25:14 +0200 | banc | (banc@gateway/vpn/airvpn/banc) |
2022-08-22 04:54:01 +0200 | catman | (~catman@user/catman) (Ping timeout: 252 seconds) |
2022-08-22 05:27:18 +0200 | ft | (~ft@shell.chaostreff-dortmund.de) (Ping timeout: 240 seconds) |
2022-08-22 05:42:27 +0200 | benin0 | (~benin@183.82.205.66) (Ping timeout: 248 seconds) |
2022-08-22 06:17:15 +0200 | jao | (~jao@cpc103048-sgyl39-2-0-cust502.18-2.cable.virginm.net) (Ping timeout: 252 seconds) |
2022-08-22 07:20:55 +0200 | catman | (~catman@user/catman) |
2022-08-22 08:11:16 +0200 | catman | (~catman@user/catman) (Ping timeout: 268 seconds) |
2022-08-22 09:01:42 +0200 | cfricke | (~cfricke@user/cfricke) |
2022-08-22 09:15:24 +0200 | alternateved | (~user@staticline-31-183-146-203.toya.net.pl) |
2022-08-22 09:28:50 +0200 | mvk | (~mvk@2607:fea8:5ce3:8500::a1ec) (Ping timeout: 255 seconds) |
2022-08-22 10:04:41 +0200 | benin0 | (~benin@183.82.206.27) |
2022-08-22 10:33:32 +0200 | wonko | (~wjc@2a0e:1c80:2::130) |
2022-08-22 10:44:12 +0200 | alternateved | (~user@staticline-31-183-146-203.toya.net.pl) (Ping timeout: 268 seconds) |
2022-08-22 10:50:22 +0200 | banc | (banc@gateway/vpn/airvpn/banc) (Ping timeout: 268 seconds) |
2022-08-22 11:00:20 +0200 | sogens[m] | (~gruntspla@2001:470:69fc:105::2:50d7) (Quit: You have been kicked for being idle) |
2022-08-22 11:26:12 +0200 | thaumavorio | (~thaumavor@thaumavor.io) (Quit: ZNC 1.8.2 - https://znc.in) |
2022-08-22 11:26:58 +0200 | thaumavorio | (~thaumavor@thaumavor.io) |
2022-08-22 11:32:38 +0200 | alternateved | (~user@staticline-31-183-146-203.toya.net.pl) |
2022-08-22 12:19:13 +0200 | wonko | (~wjc@2a0e:1c80:2::130) (Ping timeout: 256 seconds) |
2022-08-22 12:27:09 +0200 | sagax | (~sagax_nb@user/sagax) (Ping timeout: 256 seconds) |
2022-08-22 12:40:50 +0200 | <liskin> | probably pebkac, rebase can always be made to work |
2022-08-22 12:52:32 +0200 | wonko | (~wjc@2a0e:1c80:2::130) |
2022-08-22 13:03:59 +0200 | wonko | (~wjc@2a0e:1c80:2::130) (Ping timeout: 256 seconds) |
2022-08-22 13:12:34 +0200 | banc | (banc@gateway/vpn/airvpn/banc) |
2022-08-22 13:42:07 +0200 | wonko | (~wjc@2a0e:1c80:2::130) |
2022-08-22 13:47:32 +0200 | <geekosaur[m]> | Again I was using the web interface since I knew what the conflict was. I don't think GitHub supports rebases for conflict resolution |
2022-08-22 14:08:16 +0200 | <geekosaur> | It took GH years to support rebase instead of merge for normal merges; I think they still don't support rebases for conflict resolution since I couldn't find an option for it. I even commented on the PR about it |
2022-08-22 14:15:41 +0200 | <liskin> | oh, I see |
2022-08-22 14:22:14 +0200 | <geekosaur> | next time I'll do it offline so I can rebase; as I commented, I really don't like merges much and consider the merge commits that come with merging instead of rebasing PRs to be confusing noise |
2022-08-22 14:26:33 +0200 | qbt | (~qbt@user/edun) |
2022-08-22 14:35:35 +0200 | scardinal | (~supreme@customer-212-237-101-39.ip4.gigabit.dk) (Quit: leaving) |
2022-08-22 14:39:14 +0200 | scardinal | (~supreme@customer-212-237-101-39.ip4.gigabit.dk) |
2022-08-22 14:43:23 +0200 | wonko | (~wjc@2a0e:1c80:2::130) (Ping timeout: 255 seconds) |
2022-08-22 15:12:28 +0200 | benin0 | (~benin@183.82.206.27) (Quit: Ping timeout (120 seconds)) |
2022-08-22 15:12:48 +0200 | benin0 | (~benin@183.82.206.27) |
2022-08-22 15:51:55 +0200 | benin0 | (~benin@183.82.206.27) (Ping timeout: 268 seconds) |
2022-08-22 15:53:54 +0200 | benin0 | (~benin@183.82.206.27) |
2022-08-22 15:55:37 +0200 | jeeeun4 | jeeeun |
2022-08-22 15:57:28 +0200 | [Leary] | (~Leary]@user/Leary/x-0910699) (Ping timeout: 268 seconds) |
2022-08-22 15:59:12 +0200 | [Leary] | (~Leary]@user/Leary/x-0910699) |
2022-08-22 16:17:10 +0200 | jao | (~jao@cpc103048-sgyl39-2-0-cust502.18-2.cable.virginm.net) |
2022-08-22 16:26:31 +0200 | wonko | (~wjc@2a0e:1c80:2::130) |
2022-08-22 17:14:07 +0200 | cfricke | (~cfricke@user/cfricke) (Quit: WeeChat 3.6) |
2022-08-22 17:15:47 +0200 | wonko | (~wjc@2a0e:1c80:2::130) (Ping timeout: 248 seconds) |
2022-08-22 18:44:49 +0200 | noex | (~null@user/noex) (Quit: :q!) |
2022-08-22 18:52:41 +0200 | alternateved | (~user@staticline-31-183-146-203.toya.net.pl) (Remote host closed the connection) |
2022-08-22 18:58:50 +0200 | catman | (~catman@user/catman) |
2022-08-22 19:04:10 +0200 | alternateved | (~user@staticline-31-183-146-203.toya.net.pl) |
2022-08-22 19:37:16 +0200 | catman | (~catman@user/catman) (Quit: WeeChat 3.6) |
2022-08-22 19:39:11 +0200 | wonko | (~wjc@2a0e:1c80:2::130) |
2022-08-22 19:52:08 +0200 | catman | (~catman@user/catman) |
2022-08-22 19:52:26 +0200 | mc47 | (~mc47@xmonad/TheMC47) |
2022-08-22 19:59:19 +0200 | catman | (~catman@user/catman) (Ping timeout: 252 seconds) |
2022-08-22 20:08:56 +0200 | qbt | (~qbt@user/edun) (Quit: WeeChat 3.5) |
2022-08-22 20:12:40 +0200 | alternateved | (~user@staticline-31-183-146-203.toya.net.pl) (Remote host closed the connection) |
2022-08-22 20:14:37 +0200 | catman | (~catman@user/catman) |
2022-08-22 20:18:07 +0200 | alternateved | (~user@staticline-31-183-146-203.toya.net.pl) |
2022-08-22 20:18:43 +0200 | jao | (~jao@cpc103048-sgyl39-2-0-cust502.18-2.cable.virginm.net) (Ping timeout: 248 seconds) |
2022-08-22 20:21:33 +0200 | jao | (~jao@cpc103048-sgyl39-2-0-cust502.18-2.cable.virginm.net) |
2022-08-22 20:23:11 +0200 | benin0 | (~benin@183.82.206.27) (Quit: The Lounge - https://thelounge.chat) |
2022-08-22 20:32:10 +0200 | catman | (~catman@user/catman) (Quit: WeeChat 3.6) |
2022-08-22 20:34:20 +0200 | catman | (~catman@user/catman) |
2022-08-22 20:37:33 +0200 | alternateved | (~user@staticline-31-183-146-203.toya.net.pl) (Remote host closed the connection) |
2022-08-22 20:37:53 +0200 | alternateved | (~user@staticline-31-183-146-203.toya.net.pl) |
2022-08-22 20:40:08 +0200 | alternateved | (~user@staticline-31-183-146-203.toya.net.pl) (Remote host closed the connection) |
2022-08-22 20:40:24 +0200 | alternateved | (~user@staticline-31-183-146-203.toya.net.pl) |
2022-08-22 20:52:37 +0200 | chomwitt | (~chomwitt@2a02:587:dc09:3900:9994:71e5:52c9:ca3d) |
2022-08-22 21:25:28 +0200 | alternateved | (~user@staticline-31-183-146-203.toya.net.pl) (Remote host closed the connection) |
2022-08-22 21:26:19 +0200 | chomwitt | (~chomwitt@2a02:587:dc09:3900:9994:71e5:52c9:ca3d) (Remote host closed the connection) |
2022-08-22 21:38:29 +0200 | catman | (~catman@user/catman) (Ping timeout: 268 seconds) |
2022-08-22 21:45:45 +0200 | benin0 | (~benin@183.82.206.27) |
2022-08-22 21:53:35 +0200 | wonko | (~wjc@2a0e:1c80:2::130) (Ping timeout: 255 seconds) |
2022-08-22 22:27:56 +0200 | wonko | (~wjc@2a0e:1c80:2::130) |
2022-08-22 22:37:08 +0200 | themc47 | (~mc47@xmonad/TheMC47) |
2022-08-22 22:39:32 +0200 | jao | (~jao@cpc103048-sgyl39-2-0-cust502.18-2.cable.virginm.net) (Ping timeout: 268 seconds) |
2022-08-22 22:39:55 +0200 | mc47 | (~mc47@xmonad/TheMC47) (Ping timeout: 252 seconds) |
2022-08-22 22:59:47 +0200 | themc47 | (~mc47@xmonad/TheMC47) (Quit: Leaving) |
2022-08-22 23:26:42 +0200 | catman | (~catman@user/catman) |
2022-08-22 23:29:07 +0200 | wonko | (~wjc@2a0e:1c80:2::130) (Ping timeout: 248 seconds) |
2022-08-22 23:44:19 +0200 | catman | (~catman@user/catman) (Ping timeout: 256 seconds) |
2022-08-22 23:46:02 +0200 | catman | (~catman@user/catman) |