#强制删除分支（不能删除当前所处的分支） # git branch -d xxxxx #删除空的分支，删除已被合并的分支 # git merge yyy #将yyy分支合并到当前分支（当前为xxx），源为 yyy，目的为xxx # git branch --no-merged remotes/origin/bran3 remotes/origin/bran4 remotes/origin/main #管理员再决定是否合并分支 管理员电脑上：main分支# git merge remotes/rmtRepo/bran4 #将远程的 bran4合并到本地的main分支 管理员电脑上：main分支# git push -uf rmtRepo main 支 成员电脑上操作： # git fetch rmtRepo main #同步远程代码库（同步远程的main分支到 本地的当前分支） # git merge remotes/origin/main main #合并同步远程代码库的main分支到 本地的main分支 ★其他克隆操作 # git clone -b bran5

to trunk ii. Con – Branch work, in isolation, becomes increasingly difficult to integrate and merge into trunk iii. Integration problem cause significant rework and often cause additional delays due entire project ii. When merging is difficult, less able to refactor due to potential rework and merge problems 1. Cross-cutting dependency improvements often provide high-payoffs d. ADOPT TRUNK-BASED