Time  Nick        Message
11:20 Megaf       ⛏️ Hi all
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: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
17:12 Krock       hi
17:59 IcyDiamond  Hi
18:03 Krock       what's new? :)
18:12 rubenwardy  scooby-doo, wooo-o-o-o-oooohh
23:20 Fixer       compilation error, oooooo-ohhh-ohhhhhhhh