ec changed the topic of #elliottcable to: a 𝕯𝖊𝖓 𝖔𝖋 𝕯𝖊𝖙𝖊𝖗𝖒𝖎𝖓𝖊𝖉 𝕯𝖆𝖒𝖘𝖊𝖑𝖘 slash s͔̞u͕͙p͙͓e̜̺r̼̦i̼̜o̖̬r̙̙ c̝͉ụ̧͘ḷ̡͙ţ͓̀ || #ELLIOTTCABLE is not about ELLIOTTCABLE
Rurik has quit [Quit: Rurik]
Sgeo_ has quit [Read error: Connection reset by peer]
Sgeo has joined #elliottcable
<ec> nuck: and now my changes are segfaulting git-rebase ...
<ec> jesus christ this has been the most Git week of all time
<nuck> HOW DO YOU DO THIS
<nuck> You and git is like me and python
<ec> oh. oh my. okay, *all* git commands are now segfaulting in my repo, mid-rebase.
<ec> ❯ sedlex 9f03973e2a75831f2fe11f0bae550a9c19ae9281|rebase-i giff
<ec> zsh: segmentation fault git diff --patch-with-stat -M -C --find-copies-harder -l64
<ec> feck me
<nuck> This is truly incredible to witness
<ec> I figured it out tho
<ec> I'm so fucking proud
<nuck> I guess the answer is to delete the repo history and start over
<ec> took me a month — and more specifically, a directed twenty-or-so hours over yesterday and today
<ec> never.
<ec> that's the cowards way out of Git problems.
<ec> :P
<nuck> I think the worst thing I had to do was rebase… the first commit in a repo
<ec> I've never quite gotten there — come close, a few times over the years; but most of what I know about Git, I learned by powering my way through such issues
<ec> that's not too bad, tho, right? just creating a new root commit
<ec> then `rebase --onto`
<nuck> I think this was before --onto
<ec> oh man the reflog tho. I don't know how people use git without an intimate awareness of the reflog.
<nuck> It wasn't easy at the time I know, I can thank #git for saving me iirc
<ec> oh hey have you seen my new keeb
<ec> I think you're sufficiently nerdy to love it
<nuck> Oh no what is it
<ec> er "new keeb" — new configuration
<nuck> I haven't done many nerdy things lately
<ec> oh wow how did I not tweet about this
<nuck> I work in a Large Public Multinational Corporation now, my life is boring
<nuck> Omg that's so nerdy
<nuck> If I rolled up to the office with that shit
<nuck> Man, that's just flexing too hard
<nuck> Does it come in aeron
<ec> idk my mounting approach was a nightmare; took a lot of fiddling and false-starts
<ec> but this chair is the Aeron successor — their "Embody"
<ec> not exactly in love, but it's … fine, I guess
<jfhbrook> I kinda leave my git commits a huge mess
<jfhbrook> I'm really bad about squashing, if I don't have the auto-squash it doesn't happen
<ec> jfhbrook: I'm excessively obsessed with my git history
<jfhbrook> I know
<jfhbrook> to your detriment
<ec> jfhbrook: ell.io/tt$.gitlabels
<jfhbrook> hakuna matata!
<nuck> Wait the Aeron isn't the #1 chair any more?
<jfhbrook> it means no worries!
<ec> been using those for, uh, a decade and change
<jfhbrook> FUCK how is it 11 o'clock
<ec> I have plenty of worries, thanks
<nuck> Can't believe my company isn't giving me the best any more
<jfhbrook> I'm doing this stupid conference it's out at columbia u so it's an hour of trains
<nuck> :^)
<ec> fuck if I know; both are kinda trash
<jfhbrook> and because it's a conference it starts at 9am
<ec> I would kill for a good chair, but I've never found a single one that I actually think is very good
<ec> jfhbrook: go tf to bed, bye
<ec> nuck: anyway, get on my ergolevel :P
<nuck> Honestly my favorite chair is an armchair
<ec> yikes
<nuck> There's a quiet library space at work that's got super comfy armchairs
<nuck> I found it last week and I'm in love with the chairs
<ec> oh good fucking lord, this is gonna be a hell of a merge
<nuck> ec: my coworkers love to squash and merge and it hurts
<nuck> I like to keep my damn history 😭
<ec> fucking gross
<nuck> But I guess nobody else cares about their commit messages
<nuck> Whereas before I merge I usually do an interactive rebase to reorder and clean up my commits
<ec> 90% of Git interactions should be linear rebases by the person adding changes; and 10% should be two-parent merge-commits
<ec> literally none of them, ever, anywhere, should be squashes or octopus merges
<ec> yeah, same
<ec> it's not that fucking hard, ppl, come on
<ec> nuck: did I ever sell you on my granular-committing "system"
<ec> still using it — like, five years later. works fucking great.
<ec> fucking lol, I used to have a blog
<ec> wow
<nuck> WHAT THE FUCK IS AN OCTOPUS MERGE HOW DOES THIS WORK OMG
<ec> lolol
<nuck> Three way merges are good too
<ec> there's no bound on the number of parent-commits a single commit can have; but you *shouldn't* have more than two parents per commit
<nuck> How… do you do a multi parent merge without losing your sanity
<nuck> And why not just merge multiple times?????
<ec> care and notes lol
<nuck> This seems like an enormous pain in the ass
<nuck> I hate your blog's green highlights
<ec> so do I
<nuck> I keep tapping them like they're medium comments
<nuck> They're not
<ec> omg what lol
<ec> i was there first ಠ_ಠ
<nuck> Too bad Elliotbloggle didn't get bigger than medium
<nuck> Cause they won
<nuck> And green highlights are theirs now
<ec> shh
<ec> Elliotbloggle lol
<ec> Bloggle is a good web 1.5 name
<nuck> Like a cheap blogger knockoff
<nuck> Actually bloggle sounds like a flash game
<nuck> Something I'd play on a site less savory than newgrounds
<ec> you're thinking boggle
* ec deep breath
<ec> cross your fucking fingers for me
<ljharb> nuck: octopus merges are amazing
<ljharb> check out https://github.com/ljharb/qs, i have some *beautiful* ones
<ljharb> and because multiple merges is way unreadable
<ec> ljharb: "[New] [Fix] stringify symbols and bigints"
<ec> hhhhhhhave you met ell.io/tt$.gitlabels? :P
<ec> I also have this shitty script I've been using for years to report all the labels I've used in a given repo, and their frequency, making it easier to be consistent. http://ell.io/izBV13B+?.png
<ljharb> hm no
<ljharb> I’m consistent tho :-p
<ljharb> that one was both a bugfix and semver-minor
<ec> just sayin', it's a standard, even it's a standard of one user
<ec> be the first follower! :P
<ec> I have a lot of tooling I wish to write around this; and I've been single-handedly using it for around a decade, so I can speak as to its stability :3
<ec> oh man, oh mannnnn, gotta rebase tags now. this is gonna be a nightmare.
<ec> thank the lords above I'm not collaborating with anyone on this particular fork. ;_:
<ec> why was that even necessary; why on earth didn't the changelings come in with their associated changes ...
<ljharb> i guess that’s only 5 parents, so not a true octopus ༼;´༎ຶ ۝ ༎ຶ༽
<ec> gross.
<ljharb> ec: they did, it was all backports to previous majors
<ljharb> so not gross, *elegant rigor*
<ec> hahah, lmao
<ljharb> previous minors i mean
<ljharb> for those lone tildenauts raging against the inevitable caret takeover
<ec> tildenauts
<ec> can't even
<ljharb> just made that up
<ljharb> I’ll be waiting over here for my Pulitzer
<ec> i love the artist fka twigs
<ec> oh my GOD THIS STILL HASN'T FIXED THE BUILD. WHYYYY.
<ec> fatal: remote error: upload-pack: not our ref 0f509703fcd43ff4324d721a39220153bab49d4as/master
<ec> 0f509 is going to haunt my fucking dreams
<ljharb> something left over in your .git dir?
<ec> failing on Travis
<ec> god fucking damnit
Rurik has joined #elliottcable
<ec> that was an appropriate command for my current mood
<ec> `git push -fu ec`
Rurik has quit [Quit: Rurik]
Rurik has joined #elliottcable
_whitelogger has joined #elliottcable
Cheery has quit [Ping timeout: 245 seconds]
Cheery has joined #elliottcable
Rurik has quit [Quit: Rurik]
Rurik has joined #elliottcable
Rurik has quit [Quit: Rurik]
Rurik has joined #elliottcable
Rurik has quit [Quit: Rurik]
Rurik has joined #elliottcable
Rurik has quit [Quit: Rurik]
Rurik has joined #elliottcable
Rurik has quit [Quit: Rurik]
Rurik has joined #elliottcable
Rurik has quit [Client Quit]
Rurik has joined #elliottcable
Rurik has quit [Remote host closed the connection]
Rurik has joined #elliottcable
<jfhbrook> ahaha
Rurik has quit [Quit: Rurik]
Sgeo has quit [Ping timeout: 265 seconds]
Sgeo has joined #elliottcable
Rurik has joined #elliottcable
Rurik has quit [Quit: Rurik]
Rurik has joined #elliottcable
Rurik has quit [Quit: Rurik]