On Monday, 31 de January de 2011 18:25:38 Parker Coates wrote: > On Mon, Jan 31, 2011 at 17:36, Stefan Majewsky wrote: > > On Mon, Jan 31, 2011 at 11:34 PM, Arno Rehn wrote: > >> (Feature branches are a different thing). > > > > Am I right that these should be rebased instead of merged? > > It's my understanding that rebasing is only allowed for private, local > branches. If a branch has been pushed to the server, rebasing it will > rewrite its history and break things for anyone who has pulled it from > the server.
Private branches can also exist on the server, such as for back-up purposes.
You should never rebase a branch that people are using. However, the opposite
is also true: people shouldn't use a branch that is getting rebased.
It's just a convention to decide how to mark a branch as "rebasing" and which
ones are public.
--
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.
