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. Parker
