Monday, January 23, 2017

git merge解決衝突

假設在feature1修改index.html加入css跟h1,在修改期間其他在master也新增h1這樣發生衝突如下圖
這時候就看你要砍掉還是都保留,手動建立一個commit因為沒辦法自動合併
Posted by at

No comments:

Post a Comment

Subscribe to: Post Comments (Atom)