Debian packaging with git and conflicts resolution

[martin f krafft]

also sprach Russ Allbery <rra at stanford.edu> [2008.11.18.0056 +0100]:
> Rather than using rerere, I create a temporary merge branch based off
> upstream and merge each topic branch into it in sequence, and then merge
> the temporary merge branch into the integration branch, which seems to
> accomplish the same thing (not having to re-handle the merge conflicts
> when merging the first topic branch).

I cannot really explain this, because Git wouldn't really care, it
only tracks content, so if there is a conflict, there is a conflict,
and I can hardly imagine how to work around it. Maybe you're just
lucky?

Could you show us an example which works around a conflict that
would otherwise exist?

-- 
 .''`.   martin f. krafft <madduck at debian.org>
: :'  :  proud Debian developer, author, administrator, and user
`. `'`   http://people.debian.org/~madduck - http://debiansystem.info
  `-  Debian - when you have better things to do than fixing systems
 
"... (ethik und ästhetik sind eins.)"
                                                       -- wittgenstein