ch05 distributed image is incorrect?

[morefreeze]

It appears in here. From context (start with line 120), we know Jessica works on both branch featureA and featureB, John works on featureA only, and Josie works on featureB (featureBee). So let's take a look at the image about workflow. John and Josie their name draw conversely in square box, is it right?

So I recommend whether we rename John as Alice who works on featureA, Josie as Bob who works on featureB(ee), Jessica as Candy who works on both. The origin naming is too confused.

[jnavila]

@ben Would you prefer changing the text or the picture (picture would make more sense)?

[ben]

Yeah, changing the figure makes more sense, though I like the suggestion to change the names throughout. Can we use Carol instead of Candy, though?

[jnavila]

Sorry, I don't understand your question. Where does Candy appear in this story?

[jnavila]

Ah, OK, @ben. You meant changing the text as described by @morefreeze . Well, I don't have the editor application for the pictures, so this change can only go half-way.

[YueLinHo]

So, using application Sketch on Mac to edit \diagram-source\progit.sketch file, then exporting png file.

• Josie -> Alice (work on feature A)
• John -> Bob (work on feature B)
• Jessica -> Carol (work on feature A and B)

And modifying the file \book\05-distributed-git\sections\contributing.asc

• John -> Alice (work on feature A)
• Josie -> Bob (work on feature B)
• Jessica -> Carol (work on feature A and B)

[YueLinHo]

Why close it?

[morefreeze]

@YueLinHo Sorry, I thought you have edit the picture and merge PR. It's my mistake.

[YueLinHo]

:smile: I wish I could. I need a Mac and Sketch 3.

[YueLinHo]

@schacon said:

Jessica is my wife's name and John was her father's name.

cf. https://github.com/progit/progit2/pull/1006#issuecomment-368390960

[YueLinHo]

Actually, I have created a new SVG file for this figure. And I can rename now. Here is the png exporting file from SVG file:

But, I have few questions:

1. Is rename good? or just close this issue
2. If we go renaming, I want to know the actual font face. (Consolas is used for now.)

[YueLinHo]

Rename Candy to Carol (cf. ben's comment)

[morefreeze]

I absolutely perfer new image but also respect Scott original naming.

1. New naming is more clear for readers
2. Scott is familiar with original naming without doubt

I'm appreciate your great work @YueLinHo

[KZiemian]

The true stumbling block seems to be creating new graphics in the same graphics style as Mac's Sketch 3 (I don't know nothing about Macs so I maybe write stupid things). If @YueLinHo work can be utilized I will try (and probably fail) to make PR with appropriate changes. But, first I need to learn more AsciiDoc and this is can be a big stumbling block.