When both branches have moved, Git combines changes using their common ancestor. Independent file edits can merge without a conflict, but the result needs a commit with two parents. A fast-forward-only request would fail on this history. Keep both contributions and inspect the graph after integration. A file copied manually can look right while losing the branch relationship, so these tasks check the merge structure as well as the delivered files. A merge of independent files should retain both paths. Changes on separate lines of the same file can also combine automatically. Conflicting edits on one line need the explicit resolution workflow in the next lesson.