| Time |
Nick |
Message |
| 00:28 |
|
GreenDimond joined #minetest-hub |
| 00:42 |
|
fluxflux joined #minetest-hub |
| 01:52 |
|
scr267a joined #minetest-hub |
| 02:40 |
|
twoelk|2 left #minetest-hub |
| 07:01 |
|
CWz_ joined #minetest-hub |
| 08:52 |
|
tomraceror joined #minetest-hub |
| 10:44 |
|
Fixer joined #minetest-hub |
| 10:54 |
|
Megaf joined #minetest-hub |
| 11:20 |
Megaf |
⛏️ Hi all |
| 12:05 |
|
xerox123_4 joined #minetest-hub |
| 12:51 |
|
Rafi59 joined #minetest-hub |
| 13:02 |
|
scr267_ joined #minetest-hub |
| 13:17 |
|
calcul0n joined #minetest-hub |
| 13:33 |
|
nri joined #minetest-hub |
| 13:36 |
|
aerozoic joined #minetest-hub |
| 13:43 |
|
scr267 joined #minetest-hub |
| 14:01 |
|
tomraceror joined #minetest-hub |
| 14:21 |
|
scr267_ joined #minetest-hub |
| 15:12 |
|
scr267_ joined #minetest-hub |
| 15:25 |
|
pyrollo joined #minetest-hub |
| 15:31 |
|
tomraceror left #minetest-hub |
| 15:45 |
|
tumeninodes joined #minetest-hub |
| 15:46 |
|
lisac joined #minetest-hub |
| 15:50 |
tumeninodes |
SO here's a dumb question. When I add an edit from a review to a PR, and then I do a pull into my local file, and it shows this https://pastebin.com/Pm26sZE7 but like an idiot, I went into the local file and manually made the changes before pulling and now get this https://pastebin.com/ZZPXTDpR should I just redo the PR or does someone want to talk me through fixing this mess? xP |
| 15:51 |
tumeninodes |
I added the edit via the stupid button on github web interface and then went into my local file and manually added the changes and made a mess |
| 15:53 |
tumeninodes |
I love git and hate it at the same time because it does not automatically detect that I'm an idiot, and adjust things accordingly :) |
| 15:55 |
tumeninodes |
actually, looking at the time, I will just redo the PR later, I need to get ready to go pick someone up to bring them for their chemo treatment soon |
| 16:00 |
|
vesper11 joined #minetest-hub |
| 16:09 |
|
Rafi59 joined #minetest-hub |
| 16:27 |
|
pyrollo joined #minetest-hub |
| 16:28 |
|
atorian37 joined #minetest-hub |
| 16:33 |
tumeninodes |
!seen DS-Minetest |
| 16:33 |
MinetestBot |
tumeninodes: ds-minetest was last seen at 2019-08-10 16:03:04 UTC on #minetest-hub |
| 16:35 |
tumeninodes |
ds-minetest: paging dr ds-minetest |
| 16:57 |
|
Thomas-S joined #minetest-hub |
| 16:57 |
|
Thomas-S joined #minetest-hub |
| 17:08 |
|
Krock joined #minetest-hub |
| 17:12 |
Krock |
hi |
| 17:59 |
IcyDiamond |
Hi |
| 18:03 |
Krock |
what's new? :) |
| 18:12 |
rubenwardy |
scooby-doo, wooo-o-o-o-oooohh |
| 21:25 |
|
lllI1I joined #minetest-hub |
| 23:08 |
|
aerozoic joined #minetest-hub |
| 23:20 |
Fixer |
compilation error, oooooo-ohhh-ohhhhhhhh |
