Git解決合併分支衝突

1. 建立feature1分支 $ git checkout -b feature1 Switched to a new branch 'feature1' 2. 修改readme.txt文件並提交至版本庫 $ cat readme.txt git is a version control system. git is free software under the GPL. git tracks

>>阅读原文<<