also sprach Teemu Ikonen <[EMAIL PROTECTED]> [2008.08.27.2009 +0100]:
> So my integration (or debian) branch should be a TopGit branch
> which depends on all the applied feature branches + upstream, and
> I should do the conflict resolution when the base for it is
> merged?

Yes.

-- 
 .''`.   martin f. krafft <[EMAIL PROTECTED]>
: :'  :  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
 
officer, arrest that man! he's whistling a copyrighted song.

Attachment: digital_signature_gpg.asc
Description: Digital signature (see http://martin-krafft.net/gpg/)

_______________________________________________
vcs-pkg-discuss mailing list
vcs-pkg-discuss@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/vcs-pkg-discuss

Reply via email to