The scenario seems to be the following (taking HACKING file as a filename example):
have a branch A (containing a HACKING file),
create a branch A-packaging from A (containing a HACKING file too, consequentely)
then, use merge-upstream workflow, the A pristine tar not having a HACKING file., HACKING file is so removed from A-packaging.
If upstream changed the HACKING file, and merge back the packaging branch to their upstream branch (for instance, with hudson daily build), there will be a conflict in the HACKING file.
The scenario seems to be the following (taking HACKING file as a filename example):
have a branch A (containing a HACKING file),
create a branch A-packaging from A (containing a HACKING file too, consequentely)
then, use merge-upstream workflow, the A pristine tar not having a HACKING file., HACKING file is so removed from A-packaging.
If upstream changed the HACKING file, and merge back the packaging branch to their upstream branch (for instance, with hudson daily build), there will be a conflict in the HACKING file.