New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Episode 1: "merging" graphics is misleading #357

Open
andreas-h opened this Issue Nov 1, 2016 · 2 comments

Comments

Projects
None yet
5 participants
@andreas-h
Contributor

andreas-h commented Nov 1, 2016

I believe that the merge.svg image in Episode 1 is misleading: Both changes just append text at the end of the original document, which means that when merging , it is not clear which of the new lines (from version 1 or version 2) should go first.

I think it would be better if versions 1 and 2 would add new text at different parts of the original document, because then the merge would be clear.

@kekoziar

This comment has been minimized.

Contributor

kekoziar commented Feb 16, 2018

@andreas-h , I understand what you are saying. Will you revise the image?

@djhoese

This comment has been minimized.

djhoese commented Jul 19, 2018

I'm preparing to use the git lesson as my teaching demo and had the say opinion about the image as @andreas-h. I was also wondering if red and green are maybe not the best colors to use. I'm not sure if color blindness is an issue with these exact shades of red and green, but even to me (not colorblind) I can see how it might be a confusing diagram. Another thing that seemed odd to me about it is the use of red when talking about possible merge conflicts, but not having red represent a conflict.

@kekoziar I'm not sure I have the time to update the image(s) but if someone did have the time, how would they do it? What is the preferred way of modifying svg images?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment