Em Quinta-feira, 11 de Novembro de 2010, às 11:55:36, Oswald Buddenhagen escreveu: > > A merge that was successful at one point can fail when rebased/remerged. > > of course, but that's no different from any other commit in the queue. > it gets automatically set to revise and resubmit, and you repeat it. > of course, you would have rerere.enabled=true (rerere.autoupdate=true is > also very helpful), so you'd only need to resolve the new conflicts. > that's in fact what i do to avoid a second merge when the target branch > "runs away" while i'm resolving conflicts.
The point is that you can't always rebase. If you want to preserve the commits
and they can't be rebased (because they were done 6 months ago and are part of
a 500-change feature development), the only way is to merge.
--
Thiago Macieira - thiago.macieira (AT) nokia.com
Senior Product Manager - Nokia, Qt Development Frameworks
Sandakerveien 116, NO-0402 Oslo, Norway
signature.asc
Description: This is a digitally signed message part.
_______________________________________________ Opengov mailing list Opengov@qt-labs.org http://lists.qt-labs.org/listinfo/opengov
