• 1 Post
  • 53 Comments
Joined 2 years ago
cake
Cake day: October 21st, 2023

help-circle



  • 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.



  • 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.

    1. Pushing your commit without fetching
    2. 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.


  • Disclaimer: 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.








  • 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.