In my cases I has to solve same code conflicts multiple times during a rebase, so I just don’t try them when hit with conflicts.
I fail to see the benefits of “clean” git history
In my cases I has to solve same code conflicts multiple times during a rebase, so I just don’t try them when hit with conflicts.
I fail to see the benefits of “clean” git history
I’m the opposite. I just let git take care of the stupid content. Why mess with the commit graph? Merging locally (instead of squashing) works better with merge requests because the graph clearly shows what changes went where.
I do some branch maintenance on my local branch (rebasing) until there are conflicts, but other than that I don’t see any benefit for messing with commit history.
Same… My usual strategy: rebase, if conflict abort and merge, if no conflict continue; merge always with explicit commits to master / main (no fucking squashing); keep task references in branch names and commit messages.
I’d say it takes a certain curiosity to make all of this work. Like the other day I read up on SQL indexes and how they work under the hood. I didn’t need to, I know what they do and what I needed them to do. But there was this itch when I realized that I don’t know how they do it.
And there are many such things depending on the specialty. I’m in web dev and often the work I do is very detached from actual communication protocols and such. I see devs that don’t even know how cookies work in an MVC app. And while it’s not necessary, it helps a lot to have basic understanding of what happens when you call an API, how exactly HTTP differs from HTTPS, even what happens at TLS and TCP layer of things.
I consider myself a generalist and it’s this curiosity that makes me adequate in many different subspecialties. I’m not the best at things, but I can get shit done myself when I need to.
This exactly why I consider myself to be a good programmer. I like solving problems and I don’t want to outsource that.
When Microsoft announced the sunset of Windows 10.
I was still in uni at that time. Started with Ubuntu, disliked snaps and moved to Pop. Stayed there for last 5-ish (?) years. It does what I want it to do, I don’t care about switching distros now.
What ever value you get from chance conversations will overwhelmed by people spending significantly less time actually working.
I’ve also heard that Slack get real expensive for larger enterprises.
I’ve taken to say Fucking Teams™. Our company has Slack and our client uses Fucking Teams™ and it’s a constant meme of audio not working, sharing not working, notifications not working, etc.
I just hate the thing. It’s inferior in every way except that it’s dirt cheap for the client and it’s already there with office suite.
Office suite is another pet peeve of mine when it comes to sharing information. Just make a PDF! Do not share your .docx file. Half of my team don’t even have an office suite installed. So we get 3 or 4 different renditions of the same document depending on where we open it in (Libre, Word regular, Word web, Google docs). Just make a god damn PDF!
I second this, although I’m mostly alone with git extensions in my workplace.
I migrated to from sourcetree some years ago. At the time we had some big generated API client classes (imagine ~60k lines of code). They needed to be regenerated whenever we made changes and the diff on sourcetree was shitting the bed every time I needed to stage the damn files. It was just way too lagy, so I got fed up and moved.
On my personal machine I prefer lazygit or just plain CLI.
Notification syncing between devices is nonexistent in Teams and there are no conversation threads.
In general teams is way more buggy with worse UX. I don’t know if it’s a thing on Teams that our workplace disabled, but there’s no decent notification management. If I take a day off, I can set my notifications in Slack as mute for that day and I can manage notifications for messages vs mentions vs mute per channel.
On Teams I can’t permanently set Enter as new line, I have to click that rich text editor icon for every single message.
On mobile Teams started doing this thing in group chats where, if I move the cursor with drag on space gesture and then move it back to the end of the message, Teams interprets this as a desire to “attach a program”, like power apps (whatever that is).
Pasting in code block also gets me every time. I’ll start a code block in Teams window, go to another window, copy the text and click back on my code block. Teams just drops the cursor to the end of message outside my code block and by the time I notice I already hit ctrl+v
.
My last pet peeve is about formatted copy pasting and applies to Slack as well but Teams having more text formatting options shows more of an impact. Never, and I repeat, NEVER have I wanted to paste anything with formatting, especially if I grabbed it form a website, word, excel, pdf or a code editor. Why is it the default and nonnegotiable? I can change the default on Libre Office, why not on Teams? It’s a chat app why would I need headings like in a regular doc?
Every time it gets me, ctrl+c
, ctrl+v
, fuck ctrl+z
, ctrl+shift+v
…
I scored 10/28 on https://jsdate.wtf/ and all I got was this lousy text to share on social media.
Maybe I just haven’t been exposed to bad examples. Never had any issues with blame and merge commits.