I am restoring a small repo from scratch in a new empty git repository, using only patches (generated using format-patch -M -B --root master, about 180 patch files in total) and at the time during which the merge conflict occurred in the original history, patches are no longer applied. I wonder what is behind this, and how to solve it, either during the creation of the patch, or during the application process. I used the option --rejectin git am, and I can manually fix the rejected piece, but I know that there are more merge conflicts and that manual intervention will quickly become inoperative. It seems to me that the full series of patches applied to an empty repo should not introduce any conflicts or errors, but maybe I did not think about it.
source
share