Branches to patches

martin f krafft madduck at debian.org
Wed Aug 27 22:12:36 UTC 2008


also sprach Teemu Ikonen <tpikonen at embl-hamburg.de> [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 <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
 
officer, arrest that man! he's whistling a copyrighted song.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: Digital signature (see http://martin-krafft.net/gpg/)
Url : http://lists.alioth.debian.org/pipermail/vcs-pkg-discuss/attachments/20080827/39b85d53/attachment.pgp 


More information about the vcs-pkg-discuss mailing list