| --- Log opened Fri Feb 02 00:00:46 2018 |
| 00:12 | <@gnolam> | https://twitter.com/mhorsfall/status/958437476858818560 |
| 00:40 | | celticminstrel [celticminst@Nightstar-gil1m1.dsl.bell.ca] has joined #code |
| 00:40 | | mode/#code [+o celticminstrel] by ChanServ |
| 01:26 | | Kindamoody is now known as Kindamoody[zZz] |
| 01:26 | | Jessikat [Jessikat@Nightstar-bt5k4h.81.in-addr.arpa] has quit [Connection closed] |
| 01:32 | | Jessikat` [Jessikat@Nightstar-s16m7f.dab.02.net] has quit [Ping timeout: 121 seconds] |
| 02:33 | <&McMartin> | Today has been a day of Moving Slowly and Not Breaking Anything. |
| 02:59 | <&[R]> | Like today's TDWTF? |
| 02:59 | <&[R]> | https://thedailywtf.com/articles/we-sell-bonds |
| 04:08 | | celticminstrel [celticminst@Nightstar-gil1m1.dsl.bell.ca] has quit [[NS] Quit: KABOOM! It seems that I have exploded. Please wait while I reinstall the universe.] |
| 06:44 | | Vornlicious [Vorn@Nightstar-uut2vi.sub-174-211-6.myvzw.com] has joined #code |
| 06:47 | | Vorntastic [Vorn@Nightstar-1l3nul.res.rr.com] has quit [Ping timeout: 121 seconds] |
| 07:01 | <&[R]> | "Equifax Releases Credit Locking App That Doesn't Work " <-- "Guys, our train is completely derailed, on fire... and worst of all. It's not in the news anymore. What can we do?" |
| 09:31 | | Degi [Degi@Nightstar-rt1kcc.dyn.telefonica.de] has joined #code |
| 10:21 | | Kindamoody[zZz] is now known as Kindamoody|afk |
| 11:10 | | Vorntastic [Vorn@Nightstar-9ljsqh.sub-174-211-6.myvzw.com] has joined #code |
| 11:11 | | Vornlicious [Vorn@Nightstar-uut2vi.sub-174-211-6.myvzw.com] has quit [Ping timeout: 121 seconds] |
| 11:18 | | gnolam_ [lenin@Nightstar-ghphrt.cust.bahnhof.se] has joined #code |
| 11:20 | | gnolam [lenin@Nightstar-ego6cb.cust.bahnhof.se] has quit [Ping timeout: 121 seconds] |
| 11:22 | | gnolam_ [lenin@Nightstar-ghphrt.cust.bahnhof.se] has quit [Ping timeout: 121 seconds] |
| 11:22 | | gnolam [lenin@Nightstar-ego6cb.cust.bahnhof.se] has joined #code |
| 11:22 | | mode/#code [+o gnolam] by ChanServ |
| 12:15 | | * TheWatcher stabstabstabs API "documentation" writers who think that "read the source and the tests" is actually documentation |
| 12:49 | | Jessikat [Jessikat@Nightstar-4sj.klt.132.82.IP] has joined #code |
| 13:23 | < Kizor> | Okay, here's what we do |
| 13:25 | < Kizor> | We invent a programming language where the program doesn't run until the documentation is in |
| 13:28 | | Kindamoody|afk is now known as Kindamoody |
| 14:04 | < Jessikat> | lol |
| 14:10 | <@TheWatcher> | Ah, kizor, you poor naive soul |
| 14:17 | | * ToxicFrog teas Jessikat |
| 14:24 | | * Jessikat sips |
| 14:31 | | Jessikat` [Jessikat@Nightstar-c91qf0.dab.02.net] has joined #code |
| 14:33 | | Jessikat [Jessikat@Nightstar-4sj.klt.132.82.IP] has quit [Ping timeout: 121 seconds] |
| 14:36 | | simon_ [simon@Nightstar-e7dcnn.com] has joined #code |
| 14:38 | < simon_> | so... in git, what's the best way to merge a feature branch into main after it passed review? I've structured my commits so that there's like 17 of them. if I rebase rather than merge, it'll be hard to undo them all easily. if I squash them, the commit history will be quite hard to read. is this a case where a classic merge is better than a rebase? |
| 15:57 | | Vorntastic [Vorn@Nightstar-9ljsqh.sub-174-211-6.myvzw.com] has quit [[NS] Quit: Bye] |
| 15:57 | | Vorntastic [Vorn@Nightstar-1l3nul.res.rr.com] has joined #code |
| 15:58 | | Degi [Degi@Nightstar-rt1kcc.dyn.telefonica.de] has quit [Connection closed] |
| 16:15 | | Vornicus [Vorn@Nightstar-1l3nul.res.rr.com] has quit [Ping timeout: 121 seconds] |
| 16:22 | | Vornicus [Vorn@Nightstar-1l3nul.res.rr.com] has joined #code |
| 16:22 | | mode/#code [+qo Vornicus Vornicus] by ChanServ |
| 20:48 | <&McMartin> | I'm a fan of classic merge in all such cases. |
| 21:01 | | Jessikat [Jessikat@Nightstar-3nknrc.dab.02.net] has joined #code |
| 21:05 | | Jessikat` [Jessikat@Nightstar-c91qf0.dab.02.net] has quit [Ping timeout: 121 seconds] |
| 21:43 | | McMartin [mcmartin@Nightstar-rpcdbf.sntcca.sbcglobal.net] has quit [Connection closed] |
| 22:06 | | Jessikat` [Jessikat@Nightstar-bt5k4h.81.in-addr.arpa] has joined #code |
| 22:38 | | Degi [Degi@Nightstar-rt1kcc.dyn.telefonica.de] has joined #code |
| 22:42 | | McMartin [mcmartin@Nightstar-rpcdbf.sntcca.sbcglobal.net] has joined #code |
| 22:42 | | mode/#code [+ao McMartin McMartin] by ChanServ |
| --- Log closed Sat Feb 03 00:00:47 2018 |