If they have measurable thickness in sideview then it is not 2D. 😎
- 3 Posts
- 279 Comments
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
Art & Design@jlai.lu•Microsoft suite icons evolution (2001 - 2025)
3·1 month agoAfter 2003, the only set I liked was 2018. Even the current iteration looks like a bad evolution.
That is a much difficult question than I initially thought. I think it is the high saturated slightly dark orange. Mainly because I do some design works, and it is bloody difficult to find a matching color. So far I found only white or black.
sorter_plainview@lemmy.todayto
Not The Onion@lemmy.world•MrBeast defends trapping man in burning building for chance to win $500,000English
1533·1 month 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
Thoughtful Discussion@discuss.online•Gen Z job crisis: Maybe there are just too many college graduates now
16·2 months agoHey, kiddo… Remember how we used to say college will improve your chance of employment and quality of life? Turns out that is not true, because too many of you got educated. So now we don’t have people to do all the menial jobs and act as a servant for the upper class. Therefore stop learning. And be uneducated, and you will be rewarded by employing you with the most rich people on earth. (Clarification: as servants)
sorter_plainview@lemmy.todayto
Thoughtful Discussion@discuss.online•Gen Z job crisis: Maybe there are just too many college graduates now
4·2 months agoI wonder how it will be if there are no elites? And all are equal?
sorter_plainview@lemmy.todayto
Technology@lemmy.world•Supporting the future of the open web: Cloudflare is sponsoring Ladybird and OmarchyEnglish
331·2 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.
sorter_plainview@lemmy.todayto
videos@hexbear.net•This is one of the wildest interviews I've ever seenEnglish
26·2 months agoPoster boy never faced a journalist who can ask proper questions.
He could have deflected it saying, “I believe what authorities are saying right now, and if, for some reason, the case again gets reopened based on these accusations, I will completely cooperate with authorities. I have nothing to hide here.”
Dude need some media training.
sorter_plainview@lemmy.todayto
Buy European@feddit.uk•Proton Mail Suspended Journalist Accounts at Request of Cybersecurity AgencyEnglish
10·2 months agoThe important question is what is the ToS violation stated in the comment. Proton is on the right side, if the CERT actually provided evidence for the violation of ToS. Believing what the journalists said, one of the accounts that is still suspended was being used for disclosures.
All Proton had to say was “we have clear evidence from the complaint that there is violation of ToS”.
On the other hand if they acted solely on the words of a CERT, because it is under a Goverment, we have a very different issue at hand.
sorter_plainview@lemmy.todayto
Chapotraphouse@hexbear.net•As news websites around the world are filled with articles about how political violence is always wrong, nobody seems to be reporting on this latest estimate. Funny how that goes.English
3·2 months agoAnother thing is, it is very easy to dismiss these figures as ‘speculation’. Hence it is easy to blame people who voice this estimates…
sorter_plainview@lemmy.todayto
news@lemmings.world•Billionaire’s Water Supply Cut Off After Wasting Millions Filling Private LakeEnglish
1·2 months agoCome on… Let this poor environment loving person to restore and preserve the national heritage. You capitalists don’t care about the environment at all.
sorter_plainview@lemmy.todayto
Fuck AI@lemmy.world•Albania appoints world's first AI-generated minister to cut back corruption
10·2 months agoI thought it was The Onion
sorter_plainview@lemmy.todayto
Selfhosted@lemmy.world•Need some help with networking - tailscale, gluetun etcEnglish
2·2 months agoI don’t understand what is the use of gluetun here. Are you trying to, say all the traffic from a laptop,to be routed through your server in your home, while you are away? If yes, can you elaborate why this is needed? Else can you give a better explanation on the setup you are trying to achieve and the results you want?
Oh wow… Anon is the next Karl Marx. He independently figured out one of the contradictions of Capitalism defined by Marx. Congratulation comrade.






For those who are unaware, she leaked footages of war crimes committed by a set of IDF soldiers. Why? She was the top lawyer of the military, tasked with enforcement of rule of law inside IDF. When she started the probe, the far right harrassed her, and even attacked her. In an attempt to control the abuse she leaked the footage. But that didn’t stop the abuse. Later she had to admit she is the person behind leaking the footage, had to step down, and face the enquiry.
In no way I’m going to argue she was a guardian angel or someone standing up for human rights, because she did the investigation purely to avoid international scrutiny. The logic is if the internal scrutiny is strong then international enformant agencies (like ICC, which I found hilarious), will not interfere with the matters inside the Isreal. In other words create a bunch of scapegoats, so that the war crimes can be continued.