4 ms·

> and these are almost always owned by a single person who is responsible for rebasing against the main branch That still seems very annoying. People have unpl

• SOLAR_FIELDS 2y ago
  In practice I’ve found: - Unplanned time off means the feature just doesn’t make it in - Living in different time zones means that you just wait and work slows down In either event, there is rebase and squash auto merge from major git providers like GitHub which helps with this a ton. With that enabled unless the repo is super high traffic usually this is an afterthought unless there is merge conflicts which is semi rare. That being said, that’s just the reality of what I’ve seen play out in various organizations. I personally like to work off other people branches a lot more than my peers because I work in platform engineering and very often developers come to me with feature branches that need some CI/infra/other change or optimization and very often it’s easiest for me to just drop a commit into their existing branch. The change falls under their ownership and it gets mainlined along with their feature.
• randerson 2y ago
  This can be mostly avoided with short-lived branches that are merged by the end of each day. If that isn't feasible, people can still collaborate on a feature branch as long as a single person is nominated to rebase it at the end.
• PaulDavisThe1st 2y ago
  They are the only ones working on the feature branch. If they take a vacation or fall ill or whatever, it causes no issues for anyone else.