Merge or Cherry-Pick?

Parker Coates parker.coates at
Mon Jan 31 23:25:38 GMT 2011

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.


More information about the kde-core-devel mailing list