Correct Git workflow for shared feature branch?
问题 I am trying to figure out the right workflow for this situation: On the shared repo, we have these branches: -master -feature The feature branch is a shared branch, since many developers are working on a new feature together. They are actively pushing their changes to the feature branch. I'm trying to avoid 'conflict hell' for the day that feature finally gets merged back into master . Currently, I see some options: 1) Actively merge master into feature , and do it often. However, this is not