@victoria The most important point is to stay away from GitFlow, and that's where we agree.

The only thing I would change is that I think a feature should be broken down into incremental pieces that can each be merged to trunk within one day. It's ok to merge an incomplete feature as long as it doesn't disrupt existing functionality.

If someone else merges to trunk and you have to merge trunk to your PR to remove conflicts, your PR is already becoming too long-lived. You're creating conflict-resolution work and making the PR harder to review.
Sign in to participate in the conversation
Mastodon for Tech Folks

This Mastodon instance is for people interested in technology. Discussions aren't limited to technology, because tech folks shouldn't be limited to technology either!