00:57 <ocdtrekkie> "merging is not possible because you have unmerged files"

00:58 <ocdtrekkie> Who on Earth wrote that error message?

01:24 <coffeebird[m]> I guess that means rocketchat is closer to an update :D

01:25 <ocdtrekkie> Nah, I'm working on something else. :P

01:25 <ocdtrekkie> But I have a Rocket.Char PR open!@

01:27 <coffeebird[m]> I've subscribed to the thread on github and it seems to be moving along

01:28 <coffeebird[m]> though I'm not sure if an upgrade will add any more functions. The jitsi bridge works well, but I'd also like to be able to send pre-recorded video and audio over mobile and that doesn't seem to work atm

01:43 <ocdtrekkie> The biggest thing is it will probably resolve issues people have had with being too out of date for apps, unless the Rocket.Chat team fixed that some other way.

01:44 <ocdtrekkie> This is the horror I just suffered: Merging two unrelated git repositories where one had a submodule with the same name as a folder in the other.

01:44 <ocdtrekkie> But MISSION ACCOMPLISHED

01:44 <ocdtrekkie> https://github.com/simonmichael/hledger/pull/789

04:11 <TimMc> I was delighted when I realized I could merge whole repos together.

04:11 <TimMc> that was the moment I truly understood git's object model

05:49 <ocdtrekkie> TimMc I certainly don't understand what I just did. I just know it works.

16:35 <TimMc> I don't know a whole lot about submodules, tbh.

16:35 <TimMc> Were you effectively bringing a submodule into the repo proper?

21:13 <ocdtrekkie> TimMc: Kinda the opposite. The sandstorm repo had the main project as a submodule.

21:14 <ocdtrekkie> Problem was, there was also a folder in the main project with the same name as the project, so when combined with said project referring to it as a submodule, it thought there was both a "file and a directory" with the same name.

21:14 <ocdtrekkie> So I had to fork the sandstorm repo, remove the submodule, and then I could do my merge.