Someone please explain what is going on. I have no clue what this is.
- 1 Post
- 53 Comments
This reminds me that my
Downloadsfolder is like the attic. I don’t fearls -ain~, but I fear what I will find if I wander intoDownloadsunprepared.
The problem is not when I have to rebase. I know how to handle it. But with juniors they approach us only when things are in a really bad situation, where they cluelessly applied some commands they found on internet or from an LLM. Then it is very annoying to sit down and untangle the mess they created.
And regarding the pushing without fetching, it is usually a different branch. So they won’t incorporate the new changes in the main branch into their working branch, but just push their work into a branch. Again not a big deal. Just annoying.
That is a very weird setup. I have no clue why that flow is needed in the first place. Branches should be something disposable easily. What was the logic behind the setup? Any idea?
See all this is fine for someone with good experience in git. They know how to solve the screw up. But wih junior devs, who don’t know much about it, they will just get confused and stuck. And one of the senior has to involve and help them solve. This is just annoying because these can be avoided very easily. Until they understand the pattern of how everyone operates with git, it just creates issues.
To me first time causing this issue is completely fine. I will personally sit with them and explain then what went wrong and how to recover. Most of them will repeat it again, act clueless and talk like they are seeing this for the first time in their life. That is the difficult part to me.
May be I’m just old school, and a grumpy old person, even though I’m not that aged.
So this workflow is needed if you are working on a public, i.e. multiple devs collaborating on a single branch, scenario. But it is much better to avoid this as much as possible. Usually it is a ‘scoping’ issue, where you create a branch that is too broad. For example ‘api-for-frontend’, which is a massive thing.
But let us say you absolutely have to get multiple devs on same branch, then this workflow is totally fine. There is nothing wrong in it.
In our org we prefer to delete the branch after merge. In a way it says ‘this branch is closed’. This is to encourage devs to define smaller and more logically scoped branches.
I want to take this opportunity to say that, branch is just a label on a commit, with some additional functions. Once you start focus on commits and lineage of the commits, then branches become some what irrelevant.
Yeah.But many of them are extremely annoying. Specifically screwing up rebase. It is recoverable, but very annoying.
That said I have seen juniors make two other common mistakes.
- Pushing your commit without fetching
- Continuing on a branch even after it was merged.
I’m fed up with these two. Yesterday I had to cherry-pick to solve a combination of these two.
sorter_plainview@lemmy.todayto
Not The Onion@lemmy.world•MrBeast defends trapping man in burning building for chance to win $500,000English
1533·4 months agoDisclaimer: I hate this guy and all the stupid things he did in the past.
I don’t understand the issue here. Assuming what he is telling regarding the safety features are true, this is not more dangerous than a stunt scene in a movie. If they had hired someone who is not a professional stunt man, I would classify this as ‘dangerous’. But I can’t really see the issue of shooting a ‘stunt scene’ with professionals, just like any action movie will do.
That said, I think this is just manufactured outrage, which will create more views for that video. Probably thile response to the video was underwhelming, and they wanted to drive up the views to ensure revenue.
sorter_plainview@lemmy.todayto
Technology@lemmy.world•Supporting the future of the open web: Cloudflare is sponsoring Ladybird and OmarchyEnglish
331·4 months agoIsn’t Ladybird adopting Swift as their preferred language? I’m slightly confused on why Ladybird over Servo. But I am sure people at Cloudflare have more knowledge than me. So I guess there is a good reason.
You know hackers in the movies are very polite and care for their user. When they are hacking or wiping the disk they show proper progress. That is much better user experience than many corporate products. Be like hackers in the movie.
sorter_plainview@lemmy.todayto
Technology@lemmy.world•I BUILT A GOOGLE NEWS CLONE JUST WITH ANTI-CAPITALIST AND LEFT-WING NEWS SOURCESEnglish
13·5 months agoI genuinely appreciate the effort. I have a few comments.
- Some of the sources are not left wing at all.
- In general I felt long form articles are not in focus. If you need help with sources I can give you my rss feed list.
- App links are not working.
Get thefuck out, and move on.
sorter_plainview@lemmy.todayto
Programmer Humor@lemmy.ml•The JavaScript type coercion algorithm
7·5 months agoThis is Haverbeke’s book, right? Eloquent JavaScript?
sorter_plainview@lemmy.todayto
Technology@lemmy.world•Humans can be tracked with unique 'fingerprint' based on how their bodies block Wi-Fi signalsEnglish
191·6 months agoIt’s all AI. You should not worry about it. In fact you should not think about it. All is going to be fine.
Going to be an unpopular opinion here. But i think the mixing of sharp curves, with very pixelish, textured hand is not really playing well together. Mixing these two styles are not easy and I have tried and failed several times. So I don’t think I can help much. But this really needs some rework IMO. I know this is not your artwork, so I’m just expressing what I felt.
I think this is enough as a Code Agent. /s.
if ! $?; then until fuck do fuck doneEdit: I know this won’t work. No need to explain.




Please tell this is fake. I want to be ignorant about this.