Merge or Cherry-Pick?

[Thiago Macieira]

On Saturday, 5 de February de 2011 00:16:03 Tom Albers wrote:
> ----- Original Message -----
> 
> > this will get us used to the merge workflow which starts with "fix it
> > in the
> > stable branch" first.
> 
> So, in conclusion, we did not pick a tool which fits our workflow, instead
> we are now adjusting our workflow to the tool.

The tool supports either workflow.

We are adjusting the workflow to improve the way we want to work.

The upside is that the adjusted workflow works better in Git.

-- 
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
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 190 bytes
Desc: This is a digitally signed message part.
URL: <http://mail.kde.org/pipermail/kde-core-devel/attachments/20110205/0c4bd448/attachment.sig>