News for hackers. Stuff that matters.
Re:I Kind of Like Rebasing by PaulDavisThe1st on Saturday June 22, 2024 @10:55PM (#40764384)
That's not at all our experience at ardour.org.

Most PRs happen against the main branch, maybe after a private feature branch, maybe not.

Meanwhile, major developments happen in a feature branch, and these are almost always owned by a single person who is responsible for rebasing against the main branch (and eventually merging back there).

But maybe our development team and pace are not good tests for this model.

Re:I Kind of Like Rebasing by kfrzcode on Sunday June 23, 2024 @12:21AM (#40764760)
OT but I love Audour so much. Thanks for you and your team!
Re:I Kind of Like Rebasing by The_Colonel on Sunday June 23, 2024 @01:13AM (#40764976)
> 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 unplanned time-off all the time, live in different timezones, or perhaps are l just busy ATM and can't do the rebase.

Re:I Kind of Like Rebasing by SOLAR_FIELDS on Sunday June 23, 2024 @02:12AM (#40765147)
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.

Re:I Kind of Like Rebasing by randerson on Sunday June 23, 2024 @08:05AM (#40766814)
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.
Re:I Kind of Like Rebasing by PaulDavisThe1st on Sunday June 23, 2024 @09:41AM (#40767405)
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.
Re:I Kind of Like Rebasing by ykonstant on Sunday June 23, 2024 @03:48AM (#40765502)
Off topic, but thank you for having a perfectly modern and beautiful skeuomorphic GUI in Ardour. Tactile buttons with descriptive names instead of vague flat squares with incomprehensible icons; I wish more software offered this kind of interface.