A (git) workflow for Debian packaging
martin f krafft
madduck at madduck.net
Tue Oct 9 21:35:21 UTC 2007
also sprach Sam Vilain <sam at vilain.net> [2007.10.09.2220 +0100]:
> 1. get a list of all of the heads that you want to merge
> 2. merge them one at time in, committing along the way so that the
> next merge (and git-mergetool etc) will work
> 3. once you've resolved all the merges, save the resultant tree
> ID, reset (--mixed) to one of the original heads, use "read-tree"
> to set the index to the merge result, then "commit-tree -p XXX -p
> XXX" to make the merge commit. The original merges will be
> discarded (that is, exist only in the reflog and be eventually
> reaped by the gc).
This should not ever happen in public. :)
But thanks for the explanation, this will be useful from time to
martin; (greetings from the heart of the sun.)
\____ echo mailto: !#^."<*>"|tr "<*> mailto:" net at madduck
Most Intelligent Customers Realise Our Software Only Fools Them.
spamtraps: madduck.bogus at madduck.net
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Size: 189 bytes
Desc: Digital signature (see http://martin-krafft.net/gpg/)
Url : http://lists.alioth.debian.org/pipermail/vcs-pkg-discuss/attachments/20071009/3033d8fc/attachment.pgp
More information about the vcs-pkg-discuss