Lets say you have a system where you have an unmodified upstream source, and a
set of patches to get that upstream source to run on your system.
As I understand it, there are two ways to deal with this in Git:
1. One branch is the upstream's release. This may be a full clone of the
upstream
It seems impossible, but we somehow lost a small changeset during a
boring-looking merge. I can't share the repository publicly, but I'll try
and show as much detail as I can.
A particular merge, SHA f1b6d234f, does not have a single-file bugfix that
we expected it to have. On examination,
