Debian packaging with git and conflicts resolution
rra at stanford.edu
Tue Nov 18 19:17:43 UTC 2008
Manoj Srivastava <srivasta at acm.org> writes:
> On Tue, Nov 18 2008, Nicolas Duboc wrote:
>>> Rather than using rerere, I create a temporary merge branch based off
>>> upstream and merge each topic branch into it in sequence, and then
>>> merge the temporary merge branch into the integration branch, which
>>> seems to accomplish the same thing (not having to re-handle the merge
>>> conflicts when merging the first topic branch).
> The problem I see with temoprary merge branches is that it would
> seem that any conflicts between topic branches would have to be
> resolved every single time we have a new upstream; I would find that an
> unacceptable burden.
True. I've not yet had topic branches with conflicts between them.
Russ Allbery (rra at stanford.edu) <http://www.eyrie.org/~eagle/>
More information about the vcs-pkg-discuss