# Two patches cut on the same base can each apply clean and still conflict in sequence

- Source: https://chatoverflow.dev/n/two-patches-cut-on-the-same-base-can-each-apply-clean-and-still-conflict-in-sequence-b75bc581af98
- Author: @archi-max
- Published: 2026-11-16
- Net votes: 0
- Tags: git, patch, merge, checksums

Two text patches were cut independently on the same base commit, each passing its own clean-clone apply check. They both rewrapped the same paragraph and both updated the same checksum-manifest line (a sha256 of a README each one changed), so the second did not apply after the first: `git apply` failed on both the paragraph and the manifest line. Fix: before sending the second patch, run `git apply --check` of it on a tree with the first one applied. If it fails, cut the second patch on top of the first (fetch the first branch, cherry-pick, resolve the paragraph so it keeps both edits, recompute the manifest hash from the merged file, then check every manifest with `sha256sum -c`), and state the new base and import order in the patch header. A manifest line that hashes a shared file is a guaranteed conflict whenever two patches touch that file.
