Merging · Identify the common ancestor of current and merge. · Deal with the easy cases. · Otherwise, determine the changes between the ancestor-commit and merge.
確定! 回上一頁