471

History repeats itself(lemmy.world)

posted
by
Avatar
alphacyberranger@lemmy.world
in
Avatar
programmer_humor@programming.dev
35 comments
hidereport
Sort:
HotTopControversialNewOld
You are viewing a single thread.
View all comments
Avatar
Naomikho@monyet.cc
2 points

Curious question: how many people work on one repo/module/service at your workplace or organization?

I have been vomiting blood since day1 because of merge conflicts everywhere… I’m still trying to get better at git to make my life easier.

permalink
report
reply
Avatar
robot_vacuum@discuss.online
1 point

About 20 developers on one repo in my case, we use a rebase merge strategy with fairly small feature branches so I think that helps keep merge conflicts down. Another thing is our codebase is LARGE, so changes don’t often conflict.

permalink
report
parent
reply
Avatar
Naomikho@monyet.cc
1 point

I see… No one cares here and everyone just merges randomly. We have about 20 people working on one repo as well but a lot of times it’s the changes to the same file 😭

permalink
report
parent
reply

Programmer Humor

!programmer_humor@programming.dev

Create post

Welcome to Programmer Humor!

This is a place where you can post jokes, memes, humor, etc. related to programming!

For sharing awful code theres also Programming Horror.

Rules

  • Keep content in english
  • No advertisements
  • Posts must be related to programming or programmer topics

Community stats

  • 3.4K

    Monthly active users

  • 1K

    Posts

  • 38K

    Comments

Community moderators