On Friday, 4 de February de 2011 14:58:52 Parker Coates wrote: > Another special and unavoidable case of this will be applications > bumping their stable version numbers. It seems weird to have a > "Updated version to 4.6.2" commit in a 4.7 master, for example, but I > guess that the (small) price one pays for mergeable stable branches.
That is the type of commit that *will* conflict when you try to merge. Then you
should be "undumb" and choose the side that says the correct version for the
branch.
--
Thiago Macieira - thiago (AT) macieira.info - thiago (AT) kde.org
Senior Product Manager - Nokia, Qt Development Frameworks
PGP/GPG: 0x6EF45358; fingerprint:
E067 918B B660 DBD1 105C 966C 33F5 F005 6EF4 5358
signature.asc
Description: This is a digitally signed message part.
