Debian packaging with git and conflicts resolution

[Manoj Srivastava]

On Sun, Nov 16 2008, martin f krafft wrote:


>> But this script will checkout the build branch and try to merge
>> the upstream branch in. That should fail due to the same conflicts
>> which were resolved in the deb/conffile-location branch. That's
>> actually what I experience with my tests.

        Well, I have seen this happen.
 a) update the upstream branch (merge from remote/upstream, or
    git_load_dirs).
 b) Merge upstream branch into topic branches; resolve conflicts.
 c) Merge topic branches into the integration branch (master, for
    me). rerere applies any conflict resolution changes. Do any other
    integration changes, and commit.
 d) Build from integration branch.

        I think this has become the standard operating procedure for me
 now. 

        manoj
-- 
"Under consideration": We never heard of it. Kelvin Throop III, "The
Management Dictionary"
Manoj Srivastava <srivasta at acm.org> <http://www.golden-gryphon.com/>  
1024D/BF24424C print 4966 F272 D093 B493 410B  924B 21BA DABB BF24 424C