Learn More
Resend Email
17
harasuke
1y

I recently started my professional journey as a developer and I stumbled upon a very strange git repo configuration..

Background: The projects consist on a web app and a lot of backend services in C# (1 service on each project).

The project manager decided to configure the the git repo as a single repo with all of the different projects for the services and the project of the webapp. All in one. Everytime you update something the merge results absurd and this happened…

rant

funny

strange

git
Favorite
Ranter
Comments
  • 0
    1y
    whaaa...
  • 1
    1y
    @We3D And this one was the same reaction of the poor guy that have to manage the repo 😂
  • 17
    1y
    Liar, this is a guitar hero screenshot set on hard difficulty
  • 1
    1y
    Good fucking lord what is this

    Not sure if you can ever demangle this mess
    Word of advice though, try to do ff-only, even if the others in the project dont.
    Merge commits lead to pretty painful situations
  • 0
    1y
    Is it because of merge commits? Did you try to merge the branch back (master into development for example)
  • 4
    1y
    ... so colorful and pretty 😍 ( b/c I don't have to deal with it ;} )
  • 1
    1y
    This was a common situation some months ago. Right now I’m not sure how the solved it but it’s a lot more contained (a less mess but still a mess)

    @WildOrangutan yes, it’s for merge commits. I’m not going to push anything for the moment. Honestly; I’m scared. Let’s see when the day will come

    @LotsOfCaffeine thanks for the advice! I’ll look into it
  • 0
    1y
    So each project is a separate branch? Yeah no.
  • 0
    1y
    This is what it looks like when you open up a random panel on the USS Enterprise
  • 0
    1y
    @electrineer No, no no… each project it’s in the same branch
  • 2
    1y
    @harasuke ah so monorepo. That's not even that bad, especially if the projects share a lot of code.
  • 1
    1y
    Monorepos are common, either filter the branches or just don't use a tree view. I never got what people use them for anyway. To me almost everything is quicker with a combination of CLI and timeline view.
  • 0
    1y
    If the tree is too big and causing problems I've heard that there's something called a partial checkout, I can't say I used it but it was designed for this purpose.
  • 0
    1y
    Many projects use a monorepo manager which solves a lot of problems inherent to the pattern. I don't think it changes the branches though, but I don't think the number of branches is a problem either. It's not like you need to touch anything other than the ancestors of your work items.
  • 0
    1y
    Also, some history visualizers do a better job, when it comes to merge commits:

    https://ricostacruz.com/til/...
  • 0
    1y
    I didn’t know monorepo was such a thing. Thanks for the explanation 👌🏻
  • 4
    1y
    If I didn't know what it was, I would say it looked kinda pretty.
  • 0
    1y
    You seem to have reverse engineered a loom
Related Rants
devRant © 2021 Hexical Labs LLC
Privacy Policy  |  Terms of Service
Add Comment