To resolve a merge conflict caused by competing line changes, you must choose which changes to incorporate from the different branches in a new commit.
確定! 回上一頁