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?
- 1 Post
- 95 Comments
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
Technology@lemmy.world•Supporting the future of the open web: Cloudflare is sponsoring Ladybird and OmarchyEnglish
331·1 month 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
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?
sorter_plainview@lemmy.todayto
Selfhosted@lemmy.world•Alternative to github pages?English
111·2 months agoHosting site in your local machine is tricky. It depends on how your ISP configured your network and most of the time you will be under CGNAT. Which means you will not have a unique public IP, but a shared one. Similarly your IP will be dynamic which will need additional configurations. Nowadays it is very difficult to host a site on local machine directly.
Edit: Checkout if your ISP provide unique IPv6 for your machine. This will not have issues of CGNAT, but you will have to setup DynamicDNS (DDNS) to accomate the changes in IP.
Edit: If there is CGNAT and you don’t have IPv6, then you need ‘NAT Hole Punching’. Usually services like Tailscale, ZeroTier, Amnezia, Innernet, v2ray, etc. are needed for that.
One thing you can try is Tailscale Funnel. Fair warning, bending your head around functioning of Tailscale is not trivial, and you will have to spend some time to properly understand and set it up.
If you prefer a simpler route, free hosting of a static site is your best bet.
Netlify is the go to solution if you are familiar with Git. I used to have my portfolio up there. Another option is, as you mentioned, Github Pages.
Vercel is the another common one people use. But it might be a little more tricky to get it working, because it focus on front end framework like Next.js.
Checkout Cloudflare Pages too. Very much similar to GitHub Pages, but with the performance and reliability of Cloudflare.
Heroku is another thing people used in the past. I think the free tier got limited nowadays.
Good luck with your adventures.
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
Science Memes@mander.xyz•What Is It Like to Be a Bat?English
12·2 months agoWorking Wikipedia link: https://en.m.wikipedia.org/wiki/What_Is_It_Like_to_Be_a_Bat
sorter_plainview@lemmy.todayto
Technology@lemmy.world•I BUILT A GOOGLE NEWS CLONE JUST WITH ANTI-CAPITALIST AND LEFT-WING NEWS SOURCESEnglish
13·2 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.
sorter_plainview@lemmy.todayto
Linux@programming.dev•Security Researchers Find XZ Utils Backdoored Debian Images on Docker Hub
195·2 months agoI have a particular feeling which I want ask you all.
In the last few years, I have seen that some new cyber security firm will come up with a new ‘novel’ security vulnerability, and media will give those ‘vulenrability’ huge coverage, but in the end in reality that vulenrability is just of academic interest, and without any real life implications?
There was a ‘logo fail’ vulnerability, then GitHub ‘leaking’ credentials (it was bad narrative built around a GitHub feature), and so many more.
All I see is fear mongering with sensationalised media coverage. Am I the only one feeling this way?
Get thefuck out, and move on.
sorter_plainview@lemmy.todayto
Programmer Humor@lemmy.ml•The JavaScript type coercion algorithm
7·3 months agoThis is Haverbeke’s book, right? Eloquent JavaScript?
sorter_plainview@lemmy.todayto
Comic Strips@lemmy.world•Excuse Me, Spider | Poorly Drawn Lines
17·3 months agoMissed a good chance for a lame pun.
“I’m checking this new inter’net’ thing”. 😁
Kollam, Kerala, India. Also some other districts in Kerala, India.
https://www.reddit.com/r/MarxistCulture/comments/1ceq87z/bus_stops_in_kerala_india/
sorter_plainview@lemmy.todayto
Technology@lemmy.world•Humans can be tracked with unique 'fingerprint' based on how their bodies block Wi-Fi signalsEnglish
191·3 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 wonder how much of this is true. Statement from the publisher
On Thursday, Krafton issued another statement addressed to “our 12 million fellow Subnauts.” The company said 90% of the $250 million payout was allocated to Unknown Worlds’ three senior leaders. Krafton accused the executives of abandoning their responsibilities in order to work on other projects, including a film, leading to delays for the game.
sorter_plainview@lemmy.todayto
Lemmy Shitpost@lemmy.world•My dog and I watching TV. If your initial reaction was different you have a filthy mind
31·4 months agoWhich means you thought about it first?




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.