避免在原木中出现大量合并噪音的工作流程
原文：Git workflow for avoiding lots of merge noise in the logs

We currently have a workflow where master is the more long-term feature release branch and numbered branches like 3.0 are for releases coming up in the next week or so. With the above example, we are ...