Merge conflicts occur when competing changes are made to the same line of a file, or when one person edits a file and another person deletes the same file.
確定! 回上一頁