You could add some more detail about the branches. We get lots and lots of questions about that.

You can tell them about the 2.1 branch and the master and you can tell them that the 2.0 gets merged into 2.1 and 2.1 into master about each week.

We should also update the 15 minutes after merging note, it can take days before it shows up live.

Yes, I have/had these questions myself and while we're at it: Say I
found a single typo. Do I have to create a topic branch for this single
correction or is it OK to put it in another branch that would be updated
anyway?

Am 05.11.2012 21:48, schrieb Wouter J:

You could add some more detail about the branches. We get lots and lots
of questions about that.

You can tell them about the |2.1| branch and the |master| and you can
tell them that the |2.0| gets merged into |2.1| and |2.1| into |master|
about each week.

We should also update the |15 minutes after merging| note, it can take
days before it shows up live.

—
Reply to this email directly or view it on GitHub
#1897 (comment).

:::::::::::::::::::::::::::::::::::::::

Björn Fromme
Webdevelopment

dreipunktnull
Elfen und Fromme GbR

Am Langen Siepen 18
42857 Remscheid

Telefon: +49 (0) 2191 - 4 61 58 36
Telefax: +49 (0) 2191 - 4 61 58 37

E-Mail: fromme@dreipunktnull.com
Web: http://www.dreipunktnull.com

:::::::::::::::::::::::::::::::::::::::

Great job! 👍

If the typo is inside this file you can put it here, otherwise I recommend to create a new PR.

EDIT: I readed to fast.. For instance, if you create a PR for book/controller and you found a typo inside that article it will be OK to put the fix in that branch and that PR, otherwise I recommend to create a different PR to organize possible comments on that typo/PR.

😊 Thanks.

I created another PR.

Am 06.11.2012 11:26, schrieb Wouter J:

Great job! 👍

If the typo is inside this file you can put it here, otherwise I
recommend to create a new PR.

—
Reply to this email directly or view it on GitHub
#1897 (comment).

:::::::::::::::::::::::::::::::::::::::

Björn Fromme
Webdevelopment

dreipunktnull
Elfen und Fromme GbR

Am Langen Siepen 18
42857 Remscheid

Telefon: +49 (0) 2191 - 4 61 58 36
Telefax: +49 (0) 2191 - 4 61 58 37

E-Mail: fromme@dreipunktnull.com
Web: http://www.dreipunktnull.com

:::::::::::::::::::::::::::::::::::::::

Hi again Björn!

This is a very nice PR! I've merged it in with only a few tweaks.

Thanks so much!

Well, it pays to be a native speaker ;-)

Thanks

Edit: What about the image? I see the textual changes have been merged but the new screenshot is missing.