Questions: Merges, Intrepid pbuilder

[Morten Kjeldgaard]

Andrew wrote:

> I figured it couldn't hurt to ask here first.

That's perfect! Another good place to ask is on the IRC channels...  
but be patient, sometimes people are too busy to chat :-)

You are right to say that some merges are tricky. But most of them  
are actually quite easy, and requires you to edit e.g. debian/control  
and debian/changelog.

If you go to  Dad (http://dad.dunnewind.net/universe.php), you'll  
find that each automatic merge attempt has a RESULT file that tells  
you which files are affected... usually it is some kind of merge  
conflict that needs to be sorted out manually.

Many of the merges have very few files affected, so start with those.

  Cheers & have fun,
Morten (mok0)